From 2dd820a084f6bf6f17f9b0c01badd085970cacf8 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 16 May 2023 21:19:46 +0200 Subject: [PATCH] Makefile: prevent make failure with Apple Silicon in case of partial rebuild --- docs/changes.txt | 1 + src/Makefile | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index 17d4bf2a3..707a631f3 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -93,6 +93,7 @@ - User Options: added --metal-compiler-runtime option - Hardware Monitor: avoid sprintf in src/ext_iokit.c - Help: show supported hash-modes only with -hh +- Makefile: prevent make failure with Apple Silicon in case of partial rebuild * changes v6.2.5 -> v6.2.6 diff --git a/src/Makefile b/src/Makefile index 04c1f7a0b..1e60bfdc7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -646,6 +646,11 @@ endif endif obj/combined.NATIVE.a: $(NATIVE_OBJS) +ifeq ($(UNAME),Darwin) +ifeq ($(IS_APPLE_SILICON),1) + $(RM) -f obj/combined.NATIVE.a +endif +endif $(AR) rcs $@ $^ ifeq ($(UNAME),Darwin)