diff options
author | Ned Deily <nad@acm.org> | 2011-06-28 20:16:55 -0700 |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2011-06-28 20:16:55 -0700 |
commit | bf430cde2d1c3797c7cae4228b126aa3e83d42ba (patch) | |
tree | 1aa976d0511742f0fca7fd2ac56bb83184644ecb /Lib/distutils/sysconfig.py | |
parent | 4f86193a689e6e017f1df4d8f14d1b7e9a2ffc6f (diff) | |
parent | 044369fd52209eb04e34a3ebf4628dec5500142d (diff) | |
download | cpython-git-bf430cde2d1c3797c7cae4228b126aa3e83d42ba.tar.gz |
Merge default.
Diffstat (limited to 'Lib/distutils/sysconfig.py')
-rw-r--r-- | Lib/distutils/sysconfig.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index 06bbc01cd6..9d7d1902aa 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -419,21 +419,6 @@ def _init_posix(): raise DistutilsPlatformError(my_msg) - # On MacOSX we need to check the setting of the environment variable - # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so - # it needs to be compatible. - # If it isn't set we set it to the configure-time value - if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g: - cfg_target = g['MACOSX_DEPLOYMENT_TARGET'] - cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '') - if cur_target == '': - cur_target = cfg_target - os.environ['MACOSX_DEPLOYMENT_TARGET'] = cfg_target - elif [int(x) for x in cfg_target.split('.')] > [int(x) for x in cur_target.split('.')]: - my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure' - % (cur_target, cfg_target)) - raise DistutilsPlatformError(my_msg) - # On AIX, there are wrong paths to the linker scripts in the Makefile # -- these paths are relative to the Python source, but when installed # the scripts are in another directory. |