Skip to content

Commit 06002b3

Browse files
[3.9] bpo-41116: Fix setup.py test for macOS Tcl/Tk frameworks (GH-23649) (GH-23650)
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. (cherry picked from commit 29afab6) Co-authored-by: Ned Deily <[email protected]>
1 parent d1f0741 commit 06002b3

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
If no explicit macOS SDK was specified, setup.py should check for Tcl and TK
2+
frameworks in /Library/Frameworks; the previous commit inadvertently broke
3+
that test.

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,11 @@ def macosx_sdk_root():
177177
m = re.search(r'-isysroot\s*(\S+)', cflags)
178178
if m is not None:
179179
MACOS_SDK_ROOT = m.group(1)
180+
MACOS_SDK_SPECIFIED = MACOS_SDK_ROOT != '/'
180181
else:
181182
MACOS_SDK_ROOT = _osx_support._default_sysroot(
182183
sysconfig.get_config_var('CC'))
183-
MACOS_SDK_SPECIFIED = MACOS_SDK_ROOT != '/'
184+
MACOS_SDK_SPECIFIED = False
184185

185186
return MACOS_SDK_ROOT
186187

0 commit comments

Comments
 (0)