summaryrefslogtreecommitdiff
path: root/arm7
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2021-11-06 17:41:16 -0400
committerGitHub <noreply@github.com>2021-11-06 17:41:16 -0400
commit48f301e353a728c328f6406a8c18f1da8d9de331 (patch)
tree95cd38dba1187d007a51dca7f455d7b6541d5110 /arm7
parent05ded46ab7f556956a2eee2411a8d2968b7e8ad6 (diff)
parentba7202457fec51d31da4d23a1840813952f30f31 (diff)
Merge pull request #470 from shinyquagsire23/macos-build
Update build scripts and instructions for MacOS Monterey
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