From 117c9060a7e4bb4c7f3a72ff41f479701a2ddc9e Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev Date: Sun, 17 Sep 2023 23:54:25 +0300 Subject: [PATCH] Prioritize 'zlib from xcode sdk' flag correctly All include directories should go into CPPFLAGS XCode SDK is supposed to be appended, otherwise Tcl/Tk in it overrides Homebrew one --- 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