summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-01-21 12:35:46 -0600
committercamthesaxman <cameronghall@cox.net>2018-01-21 12:35:46 -0600
commit7fbce3b89ff5ad8fae138ccf1842cb83cbc86799 (patch)
treede624c04c211119e0c2ed8330a40874297fb2c32
parent38c0be840e653454f7a9745ca63ae5f001a70e28 (diff)
use sed to convert library paths relative to build dir
-rw-r--r--Makefile2
-rw-r--r--sym_bss.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 556293b7a..eda7fb2c2 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,7 @@ tidy:
$(LD_SCRIPT): ld_script.txt $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld $(BUILD_DIR)/sym_bss.ld
cd $(BUILD_DIR) && sed -e "s#tools/#../../tools/#g" ../../ld_script.txt >ld_script.ld
$(BUILD_DIR)/sym_%.ld: sym_%.txt
- $(CPP) -P $(CPPFLAGS) $< > $@
+ $(CPP) -P $(CPPFLAGS) $< | sed -e "s#tools/#../../tools/#g" > $@
$(C_OBJECTS): $(BUILD_DIR)/%.o: %.c $$(C_DEP)
$(CPP) $(CPPFLAGS) $< -o $(BUILD_DIR)/$*.i
diff --git a/sym_bss.txt b/sym_bss.txt
index f36785ce8..5e22693fd 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -37,6 +37,6 @@
. = ALIGN(4); src/libs/m4a_1.o(.bss);
. = ALIGN(4); src/libs/agb_flash.o(.bss);
. = ALIGN(4); src/libs/siirtc.o(.bss);
-. = ALIGN(4); ../../tools/agbcc/lib/libgcc.a:dp-bit.o(.bss);
-. = ALIGN(4); ../../tools/agbcc/lib/libgcc.a:fp-bit.o(.bss);
-. = ALIGN(4); ../../tools/agbcc/lib/libc.a:syscalls.o(.bss);
+. = ALIGN(4); tools/agbcc/lib/libgcc.a:dp-bit.o(.bss);
+. = ALIGN(4); tools/agbcc/lib/libgcc.a:fp-bit.o(.bss);
+. = ALIGN(4); tools/agbcc/lib/libc.a:syscalls.o(.bss);