From 8d8812ab1bc0d6d7c5720de4ce7dab7af356eb4b Mon Sep 17 00:00:00 2001 From: someone2639 Date: Mon, 6 Mar 2023 23:19:15 -0500 Subject: [PATCH] Fix builds on Make 4.4 (#588) * Fix builds on Make 4.4 * oops --------- Co-authored-by: someone2639 --- Makefile | 6 ++++-- Makefile.split | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bf531a16..088aba23 100644 --- a/Makefile +++ b/Makefile @@ -693,9 +693,11 @@ $(BUILD_DIR)/%.ci4.inc.c: %.ci4.png $(BUILD_DIR)/%.elf: $(BUILD_DIR)/%.o $(call print,Linking ELF file:,$<,$@) $(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map -o $@ $< -# Override for leveldata.elf, which otherwise matches the above pattern +# Override for leveldata.elf, which otherwise matches the above pattern. +# Has to be a static pattern rule for make-4.4 and above to trigger the second +# expansion. .SECONDEXPANSION: -$(BUILD_DIR)/levels/%/leveldata.elf: $(BUILD_DIR)/levels/%/leveldata.o $(BUILD_DIR)/bin/$$(TEXTURE_BIN).elf +$(LEVEL_ELF_FILES): $(BUILD_DIR)/levels/%/leveldata.elf: $(BUILD_DIR)/levels/%/leveldata.o $(BUILD_DIR)/bin/$$(TEXTURE_BIN).elf $(call print,Linking ELF file:,$<,$@) $(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map --just-symbols=$(BUILD_DIR)/bin/$(TEXTURE_BIN).elf -o $@ $< diff --git a/Makefile.split b/Makefile.split index 6915f55a..8ea95df2 100644 --- a/Makefile.split +++ b/Makefile.split @@ -39,6 +39,8 @@ ACTOR_GROUPS := \ LEVEL_FILES := $(addsuffix leveldata,$(LEVEL_DIRS)) +LEVEL_ELF_FILES := $(foreach level_dir,$(LEVEL_DIRS),$(BUILD_DIR)/levels/$(level_dir)leveldata.elf) + SEG_FILES := \ $(SEGMENTS:%=$(BUILD_DIR)/bin/%.elf) \ $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.elf) \