diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-31 11:50:28 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 11:50:28 -0600 |
| commit | 4099f871e691c75b1beea0930fba2e1c54f4fe6e (patch) | |
| tree | c55610701fcb7d95552c862c7b5d9021feb6696a /Makefile | |
| parent | 935a098843b1176db8e4b4f8f82f70086a0ed92f (diff) | |
| parent | 7c57699fa5205aa7bb3d639a6b8d4680bc03d8dc (diff) | |
Merge pull request #502 from nullableVoidPtr/master
Remove sed from ld_script, replace with INCLUDEs
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -178,7 +178,7 @@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt $(RAMSCRGEN) ewram_data $< ENGLISH > $@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld - cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld + cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../ld_script.txt > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) |