summaryrefslogtreecommitdiff
path: root/arm7
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2021-11-24 11:14:20 -0500
committerGitHub <noreply@github.com>2021-11-24 11:14:20 -0500
commite5e8cd6859d2703814ab2ef7a6bdf0df1a6517ca (patch)
tree778dbe7ac4061fd4c131a985ba759dc2c7068025 /arm7
parentc1c291bcd10bcd6e0cdd1573587661b91ef78da5 (diff)
parent48f301e353a728c328f6406a8c18f1da8d9de331 (diff)
Merge branch 'master' into unk_02006D98
Diffstat (limited to 'arm7')
-rw-r--r--arm7/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arm7/Makefile b/arm7/Makefile
index d142c079..67a07f26 100644
--- a/arm7/Makefile
+++ b/arm7/Makefile
@@ -180,7 +180,8 @@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(LD_TEMPLATE)
$(MAKELSF) $< $(LD_TEMPLATE) $@
$(ROM): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BIN_FILES)
- $(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) $(BIN_FILES)
+ echo "$(O_FILES) $(BIN_FILES)" > $(ELF).objlist
+ $(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) @$(ELF).objlist
$(OBJCOPY) --update-section arm7=$@ -j arm7 $(foreach ov,$(OVERLAYS),--update-section $(ov)=$(BUILD_DIR)/$(ov).sbin -j $(ov)) $(ELF) 2>/dev/null
# Make sure build directory exists before compiling anything