From 09f185b6ce435e71efb923a00fd1bbb5e61fb281 Mon Sep 17 00:00:00 2001 From: Itamar Oren Date: Sun, 18 Oct 2026 14:41:13 -0700 Subject: [PATCH] Use Intel Homebrew paths for the x86-64 macOS ASAN builder The only builder using MacOSAsanNoGilBuild is "x86-64 MacOS Intel ASAN NoGIL" on itamaro-macos-intel-aws, an Intel Mac where Homebrew lives in /usr/local. The class hardcoded the Apple silicon prefix (/opt/homebrew), so configure never found OpenSSL and _ssl/_hashlib were silently not built (and test_ssl skipped). Switch it to /usr/local and rename the class to MacOSIntelAsanNoGilBuild to reflect that it's Intel-only. buildersuffix is unchanged, so existing build directories are reused. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01DsXQnJ34Z2R4BdnKVBCQMx --- master/custom/builders.py | 4 ++-- master/custom/factories.py | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/master/custom/builders.py b/master/custom/builders.py index f781c69c..c77aecd7 100644 --- a/master/custom/builders.py +++ b/master/custom/builders.py @@ -21,7 +21,7 @@ UnixRefleakBuild, UnixNoGilBuild, UnixNoGilRefleakBuild, - MacOSAsanNoGilBuild, + MacOSIntelAsanNoGilBuild, ClangUnixBuild, ClangUbsanLinuxBuild, ClangUbsanFunctionLinuxBuild, @@ -278,7 +278,7 @@ def generate_builderdefs(tags, entries): # macOS x86-64 clang ("x86-64 macOS", "billenstein-macos", UnixBuild), ("x86-64 MacOS Intel NoGIL", "itamaro-macos-intel-aws", UnixNoGilBuild), - ("x86-64 MacOS Intel ASAN NoGIL", "itamaro-macos-intel-aws", MacOSAsanNoGilBuild), + ("x86-64 MacOS Intel ASAN NoGIL", "itamaro-macos-intel-aws", MacOSIntelAsanNoGilBuild), # WASI ("wasm32-wasi", "bcannon-wasi", Wasm32WasiPreview1DebugBuild), diff --git a/master/custom/factories.py b/master/custom/factories.py index c5ce171e..255e1c7c 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -620,13 +620,14 @@ class MacOSArmWithBrewNoGilRefleakBuild(UnixNoGilRefleakBuild): ] -class MacOSAsanNoGilBuild(UnixAsanNoGilBuild): +class MacOSIntelAsanNoGilBuild(UnixAsanNoGilBuild): + # Intel (x86_64) Mac: Homebrew's prefix is /usr/local, not /opt/homebrew. buildersuffix = ".macos-with-brew.asan.nogil" configureFlags = UnixAsanNoGilBuild.configureFlags + [ - "--with-openssl=/opt/homebrew/opt/openssl@3", - "CPPFLAGS=-I/opt/homebrew/include", - "LDFLAGS=-L/opt/homebrew/lib", - "PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig", + "--with-openssl=/usr/local/opt/openssl@3", + "CPPFLAGS=-I/usr/local/include", + "LDFLAGS=-L/usr/local/lib", + "PKG_CONFIG_PATH=/usr/local/opt/tcl-tk@8/lib/pkgconfig", ] asan_options = 'detect_leaks=0:allocator_may_return_null=1:handle_segv=0' compile_environ = {'ASAN_OPTIONS': asan_options}