diff options
| author | Jesus Cea <jcea@jcea.es> | 2012-01-18 03:28:05 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2012-01-18 03:28:05 (GMT) |
| commit | 2c5b688081e8e88cecbb487e4049bc7047f1ff86 (patch) | |
| tree | ce7eb79d1685c9cd844a86ca6aade2c0ec96df69 /Lib | |
| parent | 44acda4c971f0e565b6e52dbb51267c7255662f9 (diff) | |
| parent | 6e35d417f7d3c5c53b5904c1fce54ddfbf7214e4 (diff) | |
| download | cpython-2c5b688081e8e88cecbb487e4049bc7047f1ff86.zip cpython-2c5b688081e8e88cecbb487e4049bc7047f1ff86.tar.gz cpython-2c5b688081e8e88cecbb487e4049bc7047f1ff86.tar.bz2 | |
MERGE: Emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 36c4a68..416deec 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -9,7 +9,6 @@ import re import imp import sys import string -import platform from distutils.errors import DistutilsPlatformError from distutils.dep_util import newer from distutils.spawn import spawn @@ -78,7 +77,11 @@ def get_platform (): if release[0] >= "5": # SunOS 5 == Solaris 2 osname = "solaris" release = "%d.%s" % (int(release[0]) - 3, release[2:]) - machine += ".%s" % platform.architecture()[0] + # We can't use "platform.architecture()[0]" because a + # bootstrap problem. We use a dict to get an error + # if some suspicious happens. + bitness = {2147483647:"32bit", 9223372036854775807:"64bit"} + machine += ".%s" % bitness[sys.maxint] # fall through to standard osname-release-machine representation elif osname[:4] == "irix": # could be "irix64"! return "%s-%s" % (osname, release) |