From 8b14062b47cc020fe1b286281dc6635b1abca68e Mon Sep 17 00:00:00 2001 From: CrepeGoat Date: Tue, 24 Oct 2023 22:28:46 -0600 Subject: [PATCH] changed tools/Makefile to also set `AR` to the system default --- tools/Makefile | 1 + tools/audiofile/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index f3f9496f..e91c08d4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -5,6 +5,7 @@ HOST_ENV := $(patsubst MINGW%,MinGW,$(HOST_ENV)) CC := gcc CXX := g++ +AR := ar CFLAGS := -I . -I sm64tools -Wall -Wextra -Wno-unused-parameter -pedantic -O2 -s LDFLAGS := -lm ALL_PROGRAMS := armips textconv patch_elf_32bit aifc_decode aiff_extract_codebook vadpcm_enc tabledesign extract_data_for_mio skyconv diff --git a/tools/audiofile/Makefile b/tools/audiofile/Makefile index 97c45d6f..ae7d1e02 100644 --- a/tools/audiofile/Makefile +++ b/tools/audiofile/Makefile @@ -1,7 +1,7 @@ CXX := g++ libaudiofile.a: audiofile.o - ar rcs $@ $^ + $(AR) rcs $@ $^ audiofile.o: audiofile.cpp audiofile.h aupvlist.h $(CXX) -std=c++11 -O2 -I. -c $< -o $@