From c158adba66b96b16659a706312bd1c354b33d1b9 Mon Sep 17 00:00:00 2001 From: Demki Date: Sat, 11 Jul 2020 09:16:37 +0300 Subject: Added sorting to makefile wildcard fixes builds with make >= 3.8.2 and < 4.3 --- arm7/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arm7') diff --git a/arm7/Makefile b/arm7/Makefile index abb7cf03..88f796a0 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -49,8 +49,9 @@ LD_TEMPLATE := ARM7-TS.lcf.template SRC_DIRS := src lib lib/src ASM_DIRS := asm data files -C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) -S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) +# sorting wildcards required for versions of make >= 3.8.2 and < 4.3 for consistent builds +C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c))) +S_FILES := $(foreach dir,$(ASM_DIRS),$(sort $(wildcard $(dir)/*.s))) C_OBJS = $(C_FILES:%.c=$(BUILD_DIR)/%.o) S_OBJS = $(S_FILES:%.s=$(BUILD_DIR)/%.o) -- cgit v1.2.3