mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-28 01:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 63955 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63955 | ronald.oussoren | 2008-06-05 14:58:24 +0200 (Thu, 05 Jun 2008) | 20 lines

  MacOS X: Enable 4-way universal builds

  This patch adds a new configure argument on OSX:
          --with-universal-archs=[32-bit|64-bit|all]

  When used with the --enable-universalsdk option this controls which
  CPU architectures are includes in the framework. The default is 32-bit,
  meaning i386 and ppc. The most useful alternative is 'all', which includes
  all 4 CPU architectures supported by MacOS X (i386, ppc, x86_64 and ppc64).

  This includes limited support for the Carbon bindings in 64-bit mode as well,
  limited because (a) I haven't done extensive testing and (b) a large portion
  of the Carbon API's aren't available in 64-bit mode anyway.

  I've also duplicated a feature of Apple's build of python: setting the
  environment variable 'ARCHFLAGS' controls the '-arch' flags used for building
  extensions using distutils.
........
This commit is contained in:
Georg Brandl 2008-07-16 02:17:56 +00:00
parent 26adf520f3
commit fcaf910a1f
14 changed files with 321 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/distutils/unixccompiler.py
View file

@ -63,7 +63,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
stripArch = '-arch' in cc_args
stripSysroot = '-isysroot' in cc_args
if stripArch:
if stripArch or 'ARCHFLAGS' in os.environ:
while True:
try:
index = compiler_so.index('-arch')
@ -72,6 +72,12 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
except ValueError:
break
if 'ARCHFLAGS' in os.environ and not stripArch:
# User specified different -arch flags in the environ,
# see also distutils.sysconfig
compiler_so = compiler_so + ' ' + os.environ['ARCHFLAGS']
if stripSysroot:
try:
index = compiler_so.index('-isysroot')