Skip to content

[3.9] bpo-41116: Fix setup.py test for macOS Tcl/Tk frameworks (GH-23649) #23650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ned-deily merged 2 commits into from
Dec 5, 2020
Merged

[3.9] bpo-41116: Fix setup.py test for macOS Tcl/Tk frameworks (GH-23649) #23650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e95b89
bpo-41116: Fix setup.py test for macOS Tcl/Tk frameworks (GH-23649)
ned-deily Dec 5, 2020
b5ff5e8
add blurb for 3.9.1 final
ned-deily Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
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.
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down