mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #13590: Improve support for OS X Xcode 4:

Browse source 
- fix test_distutils and test_sysconfig test failures by
  aligning sysconfig and distutils.sysconfig tailoring of
  configure variables (as in 2.7)
This commit is contained in:
Ned Deily 2012-07-15 21:30:03 -07:00
parent 950b76ab1a
commit 274717757d
3 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/distutils/unixccompiler.py
View file

@ -83,8 +83,9 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
except ValueError:
pass
# Check if the SDK that is used during compilation actually exists.
# If not, revert to using the installed headers and hope for the best.
# Check if the SDK that is used during compilation actually exists,
# the universal build requires the usage of a universal SDK and not all
# users have that installed by default.
sysroot = None
if '-isysroot' in cc_args:
idx = cc_args.index('-isysroot')
@ -96,21 +97,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
if sysroot and not os.path.isdir(sysroot):
log.warn("Compiling with an SDK that doesn't seem to exist: %s",
sysroot)
log.warn("Attempting to compile without the SDK")
while True:
try:
index = cc_args.index('-isysroot')
# Strip this argument and the next one:
del cc_args[index:index+2]
except ValueError:
break
while True:
try:
index = compiler_so.index('-isysroot')
# Strip this argument and the next one:
del compiler_so[index:index+2]
except ValueError:
break
log.warn("Please check your Xcode installation")
return compiler_so