mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 21:11:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 82273 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82273 | ronald.oussoren | 2010-06-27 14:37:46 +0200 (Sun, 27 Jun 2010) | 15 lines

  Merged revisions 82272 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82272 | ronald.oussoren | 2010-06-27 14:36:16 +0200 (Sun, 27 Jun 2010) | 8 lines

    Two small fixes for the support for SDKs on MacOSX:

    1) The code that checks if an path should be located in the SDK
       explicitly excludes /usr/local. This fixes issue9046

    2) The SDK variant for filtering "db_dirs_to_check" in setup.py
       was not doing anything because of a missing assignment.
  ........
................
This commit is contained in:
Ronald Oussoren 2010-06-27 12:40:35 +00:00
parent 525201a08c
commit 0f2985c1c2
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/distutils/unixccompiler.py
View file

@ -336,7 +336,9 @@ class UnixCCompiler(CCompiler):
static = os.path.join(dir, static_f)
if sys.platform == 'darwin' and (
dir.startswith('/System/') or dir.startswith('/usr/')):
dir.startswith('/System/') or (
dir.startswith('/usr/') and not dir.startswith('/usr/local/'))):
shared = os.path.join(sysroot, dir[1:], shared_f)
dylib = os.path.join(sysroot, dir[1:], dylib_f)
static = os.path.join(sysroot, dir[1:], static_f)