diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-04-12 09:44:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 09:44:36 -0700 |
| commit | fa63b7c79bd6707a8b75a402c17cf3cab9fbcccb (patch) | |
| tree | b3e3b6c12d852677a8063af6acafd0263a41fd25 | |
| parent | 0e972cfc8331293e9fac471823450fc99ec6f6c7 (diff) | |
Use gar for macs (#169)
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -17,11 +17,13 @@ else ifeq ($(UNAME_S),Linux) DETECTED_OS = linux MAKE = make + AR = ar VENV_BIN_DIR = bin endif ifeq ($(UNAME_S),Darwin) DETECTED_OS = macos MAKE = gmake + AR = gar VENV_BIN_DIR = bin endif endif @@ -121,7 +123,6 @@ OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump NM := $(MIPS_BINUTILS_PREFIX)nm -AR := ar CPP := cpp ICONV := iconv CAT := cat @@ -347,7 +348,7 @@ $(LIBULTRA_LIB): $(ULTRALIB_LIB) $(LIBDUMP_CMD) $(ULTRALIB_LIB): - $(MAKE) -C lib/ultralib VERSION=$(ULTRALIB_VERSION) TARGET=$(ULTRALIB_TARGET) FIXUPS=1 CROSS=$(MIPS_BINUTILS_PREFIX) CC=../../$(CC_OLD) + $(MAKE) -C lib/ultralib VERSION=$(ULTRALIB_VERSION) TARGET=$(ULTRALIB_TARGET) FIXUPS=1 CROSS=$(MIPS_BINUTILS_PREFIX) CC=../../$(CC_OLD) AR=$(AR) $(BUILD_DIR)/%.o: %.bin $(OBJCOPY) -I binary -O elf32-big $< $@ |