mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the fix for issue4064 to deal correctly with all three variants of 

universal builds that are presented by the configure script.
This commit is contained in:
Ronald Oussoren 2008-12-28 19:50:40 +00:00
parent 4b48c612bb
commit 88a3083c28
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Doc/distutils/apiref.rst
View File

@ -1107,6 +1107,7 @@ other utility module.
For universal binary builds on MacOS X the architecture value reflects For universal binary builds on MacOS X the architecture value reflects
the univeral binary status instead of the architecture of the current the univeral binary status instead of the architecture of the current
processor. For 32-bit universal binaries the architecture is ``fat``, processor. For 32-bit universal binaries the architecture is ``fat``,
for 64-bit universal binaries the architecture is ``fat64``, and
for 4-way universal binaries the architecture is ``universal``. for 4-way universal binaries the architecture is ``universal``.
Examples of returned values on MacOS X: Examples of returned values on MacOS X:

8
Lib/distutils/util.py
View File

@ -140,9 +140,13 @@ def get_platform ():
# 'universal' instead of 'fat'. # 'universal' instead of 'fat'.
machine = 'fat' machine = 'fat'
cflags = get_config_vars().get('CFLAGS')
if '-arch x86_64' in get_config_vars().get('CFLAGS'): if '-arch x86_64' in cflags:
machine = 'universal' if '-arch i386' in cflags:
machine = 'universal'
else:
machine = 'fat64'
elif machine in ('PowerPC', 'Power_Macintosh'): elif machine in ('PowerPC', 'Power_Macintosh'):
# Pick a sane name for the PPC architecture. # Pick a sane name for the PPC architecture.