diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-22 19:27:44 (GMT) |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-22 19:27:44 (GMT) |
commit | 68776dbd3ce5dfa04cbb957e797b164a2308af82 (patch) | |
tree | 9e017331720bcd0ef9d72fbad7d16bdaf7ccbdd2 | |
parent | 6ef9fd7c97bb45d7c9e2cee8be2ef707c8cc4b8c (diff) | |
download | cpython-68776dbd3ce5dfa04cbb957e797b164a2308af82.zip cpython-68776dbd3ce5dfa04cbb957e797b164a2308af82.tar.gz cpython-68776dbd3ce5dfa04cbb957e797b164a2308af82.tar.bz2 |
Half of the fix for issue 6957: ensure that distutils
ignores the '-isysroot' option on OSX when the
corresponding SDK is not installed.
This ensures that the user can compile extensions
on OSX 10.6 using the Python.org installer and a
default installation of Xcode.
-rw-r--r-- | Lib/distutils/sysconfig.py | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index dcc7231..6ca6720 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -592,6 +592,29 @@ def get_config_vars(*args): flags = flags + ' ' + arch _config_vars[key] = flags + # If we're on OSX 10.5 or later and the user tries to + # compiles an extension using an SDK that is not present + # on the current machine it is better to not use an SDK + # than to fail. + # + # The major usecase for this is users using a Python.org + # binary installer on OSX 10.6: that installer uses + # the 10.4u SDK, but that SDK is not installed by default + # when you install Xcode. + # + m = re.search('-isysroot\s+(\S+)', _config_vars['CFLAGS']) + if m is not None: + sdk = m.group(1) + if not os.path.exists(sdk): + for key in ('LDFLAGS', 'BASECFLAGS', + # a number of derived variables. These need to be + # patched up as well. + 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'): + + flags = _config_vars[key] + flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags) + _config_vars[key] = flags + if args: vals = [] for name in args: |