From: Ned Deily <nad@python.org>
Date: Sat, 5 Dec 2020 04:02:09 +0000 (-0500)
Subject: bpo-41116: Fix setup.py test for macOS Tcl/Tk frameworks (GH-23649)
X-Git-Tag: v3.10.0a3~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29afab6c5f656f07ac85c9b2cf089631b2557a11;p=thirdparty%2FPython%2Fcpython.git

bpo-41116: Fix setup.py test for macOS Tcl/Tk frameworks (GH-23649)

If no explicit macOS SDK was specified, setup.py should check for
Tcl and TK frameworks in /Library/Frameworks; the previous commit
inadvertently broke that test.
---

diff --git a/setup.py b/setup.py
index 0c9a42501686..90588e8b1d1f 100644
--- a/setup.py
+++ b/setup.py
@@ -177,10 +177,11 @@ def macosx_sdk_root():
     m = re.search(r'-isysroot\s*(\S+)', cflags)
     if m is not None:
         MACOS_SDK_ROOT = m.group(1)
+        MACOS_SDK_SPECIFIED = MACOS_SDK_ROOT != '/'
     else:
         MACOS_SDK_ROOT = _osx_support._default_sysroot(
             sysconfig.get_config_var('CC'))
-    MACOS_SDK_SPECIFIED = MACOS_SDK_ROOT != '/'
+        MACOS_SDK_SPECIFIED = False
 
     return MACOS_SDK_ROOT