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 --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9b8b430e..06655098 100644 --- a/Makefile +++ b/Makefile @@ -65,8 +65,9 @@ BNR := $(BUILD_DIR)/$(TARGET).bnr SRC_DIRS := 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))) # Object files O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \ -- cgit v1.2.3