summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2013-10-25 23:03:35 (GMT)
committerNed Deily <nad@acm.org>2013-10-25 23:03:35 (GMT)
commit3d2f68d242aa3e70129f3927a011251decdb94ba (patch)
treea2d22e73dc4700cce1670f8333d611577da423c8 /Lib
parent6fd25c39c47fa8a0ceaf5b8b8189da39d2007400 (diff)
downloadcpython-3d2f68d242aa3e70129f3927a011251decdb94ba.zip
cpython-3d2f68d242aa3e70129f3927a011251decdb94ba.tar.gz
cpython-3d2f68d242aa3e70129f3927a011251decdb94ba.tar.bz2
Issue #19400: Prevent extension module build failures with Xcode 5 on OS X
10.8+ when using a universal Python that included a PPC architecture, such as with a python.org 32-bit-only binary installer.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/_osx_support.py20
1 files changed, 13 insertions, 7 deletions
diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py
index 66566d0..50b2d17 100644
--- a/Lib/_osx_support.py
+++ b/Lib/_osx_support.py
@@ -235,13 +235,19 @@ def _remove_unsupported_archs(_config_vars):
if re.search('-arch\s+ppc', _config_vars['CFLAGS']) is not None:
# NOTE: Cannot use subprocess here because of bootstrap
# issues when building Python itself
- status = os.system("'%s' -arch ppc -x c /dev/null 2>/dev/null"%(
- _config_vars['CC'].replace("'", "'\"'\"'"),))
- # The Apple compiler drivers return status 255 if no PPC
- if (status >> 8) == 255:
- # Compiler doesn't support PPC, remove the related
- # '-arch' flags if not explicitly overridden by an
- # environment variable
+ status = os.system(
+ """echo 'int main{};' | """
+ """'%s' -c -arch ppc -x c -o /dev/null /dev/null 2>/dev/null"""
+ %(_config_vars['CC'].replace("'", "'\"'\"'"),))
+ if status:
+ # The compile failed for some reason. Because of differences
+ # across Xcode and compiler versions, there is no reliable way
+ # to be sure why it failed. Assume here it was due to lack of
+ # PPC support and remove the related '-arch' flags from each
+ # config variables not explicitly overriden by an environment
+ # variable. If the error was for some other reason, we hope the
+ # failure will show up again when trying to compile an extension
+ # module.
for cv in _UNIVERSAL_CONFIG_VARS:
if cv in _config_vars and cv not in os.environ:
flags = _config_vars[cv]