diff options
author | Ned Deily <nad@acm.org> | 2013-05-28 23:45:06 (GMT) |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2013-05-28 23:45:06 (GMT) |
commit | 6750282007f3444fe7b500ae9cf6172921ffd5f4 (patch) | |
tree | 8a1669f11395b830d445eb4ffaf859813dd8660b /Lib/distutils/sysconfig.py | |
parent | 56dfc2127f6b835d056d025a978f1be2bbb5d431 (diff) | |
parent | 97345680dcf920d6def6217213499be362ed1921 (diff) | |
download | cpython-6750282007f3444fe7b500ae9cf6172921ffd5f4.zip cpython-6750282007f3444fe7b500ae9cf6172921ffd5f4.tar.gz cpython-6750282007f3444fe7b500ae9cf6172921ffd5f4.tar.bz2 |
Issue #18080: merge from 3.3
Diffstat (limited to 'Lib/distutils/sysconfig.py')
-rw-r--r-- | Lib/distutils/sysconfig.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index 898aa26..d9c9d65 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -188,9 +188,15 @@ def customize_compiler(compiler): get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') - newcc = None if 'CC' in os.environ: - cc = os.environ['CC'] + newcc = os.environ['CC'] + if (sys.platform == 'darwin' + and 'LDSHARED' not in os.environ + and ldshared.startswith(cc)): + # On OS X, if CC is overridden, use that as the default + # command for LDSHARED as well + ldshared = newcc + ldshared[len(cc):] + cc = newcc if 'CXX' in os.environ: cxx = os.environ['CXX'] if 'LDSHARED' in os.environ: |