From d33b23a9be2e61bd8f3a3c3056a09ca7619fd8af Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@amcrypto.jp>
Date: Sat, 13 Jun 2026 15:45:22 +0900
Subject: [PATCH] macOS: scope x86 intrinsic fallback to local arm64 builds

Use plain objects for x86 intrinsic helper translation units only when building a local arm64-only macOS development binary. Universal macOS builds on Apple Silicon continue to use feature-specific suffix rules so the x86_64 slice keeps the required compiler flags.

Addresses the Apple Silicon Homebrew build failure reported in PR #1678. Credit to Audrius Buika for the original fix proposal and to Damian Rickard for confirming the issue on current master.
---
 src/Volume/Volume.make | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Volume/Volume.make b/src/Volume/Volume.make
index 114c704e..519b3667 100644
--- a/src/Volume/Volume.make
+++ b/src/Volume/Volume.make
@@ -95,6 +95,12 @@ else
 	OBJS += ../Crypto/Aescrypt.o
 endif
 
+ifeq "$(PLATFORM):$(LOCAL_DEVELOPMENT_BUILD):$(CPU_ARCH)" "MacOSX:true:arm64"
+	OBJS += ../Crypto/blake2s_SSE41.o
+	OBJS += ../Crypto/blake2s_SSSE3.o
+	OBJS += ../Crypto/Sha2Intel.o
+	OBJS += ../Crypto/Argon2/src/opt_avx2.o
+else
 ifeq "$(GCC_GTEQ_430)" "1"
 	OBJSSSE41 += ../Crypto/blake2s_SSE41.osse41
 	OBJSSSSE3 += ../Crypto/blake2s_SSSE3.ossse3
@@ -112,6 +118,7 @@ ifeq "$(GCC_GTEQ_470)" "1"
 else
 	OBJS += ../Crypto/Argon2/src/opt_avx2.o
 endif
+endif
 else
 OBJS += ../Crypto/wolfCrypt.o
 endif