summaryrefslogtreecommitdiffstats
path: root/Lib/_osx_support.py
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2014-06-25 20:36:14 (GMT)
committerNed Deily <nad@acm.org>2014-06-25 20:36:14 (GMT)
commit04cdfa1147d5aadbee190b3aa2c4ccfd2d4a122d (patch)
tree3f7582d80bbbd7f46f39e78954e2b8e1c4b63359 /Lib/_osx_support.py
parent975735f729df6b7767556d2d389b560dbc7500ac (diff)
downloadcpython-04cdfa1147d5aadbee190b3aa2c4ccfd2d4a122d.zip
cpython-04cdfa1147d5aadbee190b3aa2c4ccfd2d4a122d.tar.gz
cpython-04cdfa1147d5aadbee190b3aa2c4ccfd2d4a122d.tar.bz2
Issue #21811: Anticipated fixes to 3.x and 2.7 for OS X 10.10 Yosemite.
Diffstat (limited to 'Lib/_osx_support.py')
-rw-r--r--Lib/_osx_support.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py
index b6eac5f..b07e75d 100644
--- a/Lib/_osx_support.py
+++ b/Lib/_osx_support.py
@@ -450,8 +450,16 @@ def get_platform_osx(_config_vars, osname, release, machine):
# case and disallow installs.
cflags = _config_vars.get(_INITPRE+'CFLAGS',
_config_vars.get('CFLAGS', ''))
- if ((macrelease + '.') >= '10.4.' and
- '-arch' in cflags.strip()):
+ if macrelease:
+ try:
+ macrelease = tuple(int(i) for i in macrelease.split('.')[0:2])
+ except ValueError:
+ macrelease = (10, 0)
+ else:
+ # assume no universal support
+ macrelease = (10, 0)
+
+ if (macrelease >= (10, 4)) and '-arch' in cflags.strip():
# The universal build will build fat binaries, but not on
# systems before 10.4