summaryrefslogtreecommitdiff
path: root/arm7
diff options
context:
space:
mode:
authorDemki <mordbz@gmail.com>2020-07-11 09:16:37 +0300
committerDemki <mordbz@gmail.com>2020-07-11 09:16:37 +0300
commitc158adba66b96b16659a706312bd1c354b33d1b9 (patch)
tree777d208394c64d546cc70b0d99fcb295975ae1d9 /arm7
parentd022486e419b8651a9716fb50e0cedcbb6733168 (diff)
Added sorting to makefile wildcard
fixes builds with make >= 3.8.2 and < 4.3
Diffstat (limited to 'arm7')
-rw-r--r--arm7/Makefile5
1 files changed, 3 insertions, 2 deletions
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)