Merge pull request #3731 from matrix/fix_Makefile_AppleSilicon

Makefile: prevent make failure with Apple Silicon in case of partial rebuild

docs/changes.txt

@@ -107,6 +107,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
 - Unit tests: add test modules for hash-modes 31500 and 31600 and handle them in tools/test.pl
 
 * changes v6.2.5 -> v6.2.6

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)