From fa63b7c79bd6707a8b75a402c17cf3cab9fbcccb Mon Sep 17 00:00:00 2001
From: Derek Hensley <hensley.derek58@gmail.com>
Date: Fri, 12 Apr 2024 09:44:36 -0700
Subject: Use gar for macs (#169)

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6d5e2a7..4ec6c43 100644
--- a/Makefile
+++ b/Makefile
@@ -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 $< $@
-- 
cgit v1.2.3