diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-06-27 12:36:16 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-06-27 12:36:16 (GMT) |
| commit | cd17213e8e8389ea4bce1641d3878ad67b2f7782 (patch) | |
| tree | 12ba2f2e84f23848856cee5f218a235a99dcd4df /Lib/distutils | |
| parent | ad72bcc864cf019cad9a4594d7ec9550d7f93e71 (diff) | |
| download | cpython-cd17213e8e8389ea4bce1641d3878ad67b2f7782.zip cpython-cd17213e8e8389ea4bce1641d3878ad67b2f7782.tar.gz cpython-cd17213e8e8389ea4bce1641d3878ad67b2f7782.tar.bz2 | |
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.
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/unixccompiler.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py index b76f0d4..c49ac9b 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -324,7 +324,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) |