From d2c4d963d2992ce89cacf7806cc1e07c20e67c8c Mon Sep 17 00:00:00 2001 From: native-api Date: Mon, 18 Sep 2023 00:46:59 +0300 Subject: [PATCH] Prioritize 'zlib from xcode sdk' flag correctly (#2791) All include directories should go into CPPFLAGS. XCode SDK was being added to CFLAGS instead which caused old Tcl/Tk in the SDK to override a newer one in Homebrew. --- plugins/python-build/bin/python-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 6d777af2..349c8de5 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1616,7 +1616,7 @@ use_xcode_sdk_zlib() { local xc_sdk_path="$(xcrun --show-sdk-path 2>/dev/null || true)" if [ -d "$xc_sdk_path" ]; then echo "python-build: use zlib from xcode sdk" - export CFLAGS="${CFLAGS:+$CFLAGS }-I${xc_sdk_path}/usr/include" + export CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }-I${xc_sdk_path}/usr/include" if is_mac -ge 1100; then export LDFLAGS="${LDFLAGS:+$LDFLAGS }-L${xc_sdk_path}/usr/lib" fi