mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-05-05 18:05:15 +00:00
Code Activity

Merge pull request #8696 from Z3Prover/copilot/fix-z3-import-error

Browse source 
Fix arm64 libz3.dylib being packaged in x86_64 macOS wheels
This commit is contained in:
Nikolaj Bjorner 2026-02-19 10:48:30 -08:00 • committed by GitHub
commit ca1865c3fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/mk_unix_dist.py
View file

@ -140,6 +140,10 @@ def mk_build_dir(path):
opts.append('--python') opts.append('--python')
if mk_util.IS_ARCH_ARM64: if mk_util.IS_ARCH_ARM64:
opts.append('--arm64=true') opts.append('--arm64=true')
elif HOST_IS_ARM64:
# Explicitly disable arm64 when cross-compiling from ARM64 host to x64;
# without this, mk_make.py detects the ARM64 host and adds -arch arm64 flags
opts.append('--arm64=false')
if mk_util.IS_ARCH_ARM64 and LINUX_X64: if mk_util.IS_ARCH_ARM64 and LINUX_X64:
# we are on x64 machine but build for arm64 # we are on x64 machine but build for arm64
# so we have to do cross compiling on Linux # so we have to do cross compiling on Linux

5
scripts/mk_util.py
View file

@ -2756,6 +2756,11 @@ def mk_config():
CXXFLAGS = '%s -arch arm64' % CXXFLAGS CXXFLAGS = '%s -arch arm64' % CXXFLAGS
LDFLAGS = '%s -arch arm64' % LDFLAGS LDFLAGS = '%s -arch arm64' % LDFLAGS
SLIBEXTRAFLAGS = '%s -arch arm64' % SLIBEXTRAFLAGS SLIBEXTRAFLAGS = '%s -arch arm64' % SLIBEXTRAFLAGS
elif IS_OSX and os.uname()[4] == 'arm64':
# Cross-compiling from ARM64 host to x86_64: ensure the shared library
# linker also targets x86_64 (LDFLAGS already contains -arch x86_64
# from the environment, but SLIBEXTRAFLAGS is independent)
SLIBEXTRAFLAGS = '%s -arch x86_64' % SLIBEXTRAFLAGS
if IS_OSX: if IS_OSX:
SLIBFLAGS += ' -Wl,-headerpad_max_install_names' SLIBFLAGS += ' -Wl,-headerpad_max_install_names'