Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Backport of r67988

This commit is contained in:
Ronald Oussoren 2008-12-28 19:42:55 +00:00
parent 989707b24a
commit 9bc4ad224a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/distutils/util.py
View File

@ -100,7 +100,11 @@ def get_platform ():
if not macver: if not macver:
macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET') macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
if not macver: if 1:
# Always calculate the release of the running machine,
# needed to determine if we can build fat binaries or not.
macrelease = macver
# Get the system version. Reading this plist is a documented # Get the system version. Reading this plist is a documented
# way to get the system version (see the documentation for # way to get the system version (see the documentation for
# the Gestalt Manager) # the Gestalt Manager)
@ -116,16 +120,18 @@ def get_platform ():
r'<string>(.*?)</string>', f.read()) r'<string>(.*?)</string>', f.read())
f.close() f.close()
if m is not None: if m is not None:
macver = '.'.join(m.group(1).split('.')[:2]) macrelease = '.'.join(m.group(1).split('.')[:2])
# else: fall back to the default behaviour # else: fall back to the default behaviour
if not macver:
macver = macrelease
if macver: if macver:
from distutils.sysconfig import get_config_vars from distutils.sysconfig import get_config_vars
release = macver release = macver
osname = "macosx" osname = "macosx"
if (macrelease + '.') >= '10.4.' and \
if (release + '.') >= '10.4.' and \
'-arch' in get_config_vars().get('CFLAGS', '').strip(): '-arch' in get_config_vars().get('CFLAGS', '').strip():
# The universal build will build fat binaries, but not on # The universal build will build fat binaries, but not on
# systems before 10.4 # systems before 10.4