summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-01-21 15:50:12 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-01-21 15:50:12 -0600
commitf57340b729d741acae17213c9c748738fcc1dcb3 (patch)
treea2c5fba4b236bfe71a03fc7afe12f192f1916f0d
parent2ba141eac468dc34eabf5da485c8ec9942460241 (diff)
Revert "Use standard flags to link libgcc, libc"
This reverts commit 454e44aa435b02815fd708e9b0d39f9b74a7cde9.
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 37344066e..b9e2fb289 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ LDFLAGS = -Map ../../$(MAP)
OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
-LIB := -L ../../tools/agbcc/lib -lgcc -lc
+LIBGCC := tools/agbcc/lib/libgcc.a
+LIBC := tools/agbcc/lib/libc.a
SHA1 := sha1sum -c
@@ -162,7 +163,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm
cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
- cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
+ cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) ../../$(LIBC)
$(ROM): $(ELF)
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@