From c5f66b16af3c06963262f2a6e685f5d48f5403fc Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 13 Jan 2024 10:58:52 +0100 Subject: [PATCH] Use $OBJCOPY and $STRIP instead of hardcoding --- Makefile | 9 ++++++--- tools/minicargo/Makefile | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f970218a..03aaab42 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,9 @@ V ?= ! # GPROF : If set, enables the generation of a gprof annotated executable GPROF ?= +OBJCOPY ?= objcopy +STRIP ?= strip + ifneq ($(VERBOSE),) V := endif @@ -169,9 +172,9 @@ else ifeq ($(shell uname -s || echo not),Darwin) $V$(CXX) -o $@ $(LINKFLAGS) $(OBJDIR)main.o -Wl,-all_load bin/mrustc.a bin/common_lib.a $(LIBS) else $V$(CXX) -o $@ $(LINKFLAGS) $(OBJDIR)main.o -Wl,--whole-archive bin/mrustc.a -Wl,--no-whole-archive bin/common_lib.a $(LIBS) - objcopy --only-keep-debug $(BIN) $(BIN).debug - objcopy --add-gnu-debuglink=$(BIN).debug $(BIN) - strip $(BIN) + $(OBJCOPY) --only-keep-debug $(BIN) $(BIN).debug + $(OBJCOPY) --add-gnu-debuglink=$(BIN).debug $(BIN) + $(STRIP) $(BIN) endif $(OBJDIR)%.o: src/%.cpp diff --git a/tools/minicargo/Makefile b/tools/minicargo/Makefile index 3848df50..4c713d2d 100644 --- a/tools/minicargo/Makefile +++ b/tools/minicargo/Makefile @@ -8,6 +8,9 @@ ifeq ($(OS),Windows_NT) endif EXESUF ?= +OBJCOPY ?= objcopy +STRIP ?= strip + V ?= @ OBJDIR := .obj/ @@ -41,9 +44,9 @@ $(BIN): $(OBJS) ../../bin/common_lib.a ifeq ($(OS),Windows_NT) else ifeq ($(shell uname -s || echo not),Darwin) else - objcopy --only-keep-debug $(BIN) $(BIN).debug - objcopy --add-gnu-debuglink=$(BIN).debug $(BIN) - strip $(BIN) + $(OBJCOPY) --only-keep-debug $(BIN) $(BIN).debug + $(OBJCOPY) --add-gnu-debuglink=$(BIN).debug $(BIN) + $(STRIP) $(BIN) endif $(OBJDIR)%.o: %.cpp