diff options
| author |   Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-12-04 20:26:59 -0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-12-04 23:26:59 -0500 |
| commit | 06002b3f0d4570424feef37103c7e9b7d16bd63d (patch) | |
| tree | 39bfd3bdc4e2fa66a4565301829e5b698528bec1 | |
| parent | bpo-17735: inspect.findsource now raises OSError when co_lineno is out of ran... (diff) | |
| download | cpython-06002b3f0d4570424feef37103c7e9b7d16bd63d.tar.gz cpython-06002b3f0d4570424feef37103c7e9b7d16bd63d.tar.bz2 cpython-06002b3f0d4570424feef37103c7e9b7d16bd63d.zip | |
[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 29afab6c5f656f07ac85c9b2cf089631b2557a11)
Co-authored-by: Ned Deily <nad@python.org>
| -rw-r--r-- | Misc/NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst | 3 | ||||
| -rw-r--r-- | setup.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst b/Misc/NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst new file mode 100644 index 00000000000..2c8e5ea0297 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst @@ -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. @@ -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 |