mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-06-17 01:56:10 -05:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user