Skip to content

Commit 80056b4

Browse files
authored
FIXUPS -> MODERN_LD (#92)
1 parent 1616482 commit 80056b4

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
COMPARE ?= 1
2-
FIXUPS ?= 0
2+
MODERN_LD ?= 0
33
MODERN_GCC ?= 0
44

5-
ifneq ($(FIXUPS),0)
5+
ifneq ($(MODERN_LD),0)
66
COMPARE := 0
77
endif
88

@@ -24,7 +24,7 @@ endif
2424
ifneq ($(MODERN_GCC),0)
2525
COMPILER := modern_gcc
2626
COMPARE := 0
27-
FIXUPS := 0
27+
MODERN_LD := 0
2828
endif
2929

3030
BASE_DIR := extracted/$(VERSION)/$(TARGET)
@@ -188,7 +188,7 @@ ifneq ($(COMPARE),0)
188188
echo "Object file $(@F:.marker=.o) is not in the current archive" \
189189
)
190190
endif
191-
ifneq ($(FIXUPS),0)
191+
ifneq ($(MODERN_LD),0)
192192
tools/set_o32abi_bit.py $(WORKING_DIR)/$(@:.marker=.o)
193193
$(CROSS)strip $(WORKING_DIR)/$(@:.marker=.o) -N asdasdasdasd
194194
$(CROSS)objcopy --remove-section .mdebug $(WORKING_DIR)/$(@:.marker=.o)
@@ -207,7 +207,7 @@ ifneq ($(COMPARE),0)
207207
echo "Object file $(@F:.marker=.o) is not in the current archive" \
208208
)
209209
endif
210-
ifneq ($(FIXUPS),0)
210+
ifneq ($(MODERN_LD),0)
211211
tools/set_o32abi_bit.py $(WORKING_DIR)/$(@:.marker=.o)
212212
$(CROSS)strip $(WORKING_DIR)/$(@:.marker=.o) -N asdasdasdasd
213213
$(CROSS)objcopy --remove-section .mdebug $(WORKING_DIR)/$(@:.marker=.o)
@@ -230,7 +230,7 @@ ifneq ($(COMPARE),0)
230230
echo "Object file $(@F:.marker=.o) is not in the current archive" \
231231
)
232232
endif
233-
ifneq ($(FIXUPS),0)
233+
ifneq ($(MODERN_LD),0)
234234
tools/set_o32abi_bit.py $(WORKING_DIR)/$(@:.marker=.o)
235235
$(CROSS)strip $(WORKING_DIR)/$(@:.marker=.o) -N asdasdasdasd
236236
$(CROSS)objcopy --remove-section .mdebug $(WORKING_DIR)/$(@:.marker=.o)

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ If building without an target archive, than you can use `COMPARE=0` like the the
6464
note that running setup without `COMPARE=0` and no archive will result in an error,
6565
and only needs to be run once instead of per target flag combination
6666

67-
If building for use with modern linkers, than you can use `FIXUPS=1` like the the following:
67+
If building for use with modern linkers, than you can use `MODERN_LD=1` like the following:
6868

69-
- `make VERSION=L TARGET=libgultra_rom FIXUPS=1 setup`
70-
- `make VERSION=L TARGET=libgultra_rom FIXUPS=1`
69+
- `make VERSION=L TARGET=libgultra_rom MODERN_LD=1 setup`
70+
- `make VERSION=L TARGET=libgultra_rom MODERN_LD=1`
7171

72-
note that running with `FIXUPS=1` will automatically set `COMPARE=0`.
72+
note that running with `MODERN_LD=1` will automatically set `COMPARE=0`.
7373

7474
It is also possible to build archives using modern gcc by using `MODERN_GCC=1` like the following:
7575

7676
- `make VERSION=L TARGET=libgultra_rom MODERN_GCC=1`
7777

78-
note that running with `MODERN_GCC=1` will automatically set `COMPARE=0` and `FIXUPS=0`.
78+
note that running with `MODERN_GCC=1` will automatically set `COMPARE=0` and `MODERN_LD=0`.

0 commit comments

Comments
 (0)