mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-41129: Fix check for macOS SDK paths when building Python (GH-25785) (GH-25830)

Browse source 
Narrow search to match contents of SDKs, namely only files in ``/System/Library``,
``/System/IOSSupport``, and ``/usr`` other than ``/usr/local``. Previously,
anything under ``/System`` was assumed to be in an SDK which causes problems
with the new file system layout in 10.15+ where user file systems may appear
to be mounted under ``/System``.  Paths in ``/Library`` were also
incorrectly treated as SDK locations.

Co-authored-by: Ned Deily <nad@python.org>
(cherry picked from commit d52bbde942)

Co-authored-by: Ned Batchelder <ned@nedbatchelder.com>
This commit is contained in:
Miss Islington (bot) 2021-05-02 20:38:49 -07:00 • committed by GitHub
parent ad73d1657c
commit 98035ec93f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
setup.py
View file

@ -210,11 +210,11 @@ def macosx_sdk_specified():
def is_macosx_sdk_path(path):
"""
Returns True if 'path' can be located in an OSX SDK
Returns True if 'path' can be located in a macOS SDK
"""
return ( (path.startswith('/usr/') and not path.startswith('/usr/local'))
or path.startswith('/System/')
or path.startswith('/Library/') )
or path.startswith('/System/Library')
or path.startswith('/System/iOSSupport') )
def grep_headers_for(function, headers):