diff options
| author | Jesus Cea <jcea@jcea.es> | 2012-01-18 03:25:28 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2012-01-18 03:25:28 (GMT) |
| commit | f830aa54558b0d4358f427e46171e95c8218f2de (patch) | |
| tree | cdedc474e656f037a65d4922aedc6206d0e2e8ba | |
| parent | 4a8ba19783a92437b3fab4cb19f7cdd2645d3f2a (diff) | |
| download | cpython-f830aa54558b0d4358f427e46171e95c8218f2de.zip cpython-f830aa54558b0d4358f427e46171e95c8218f2de.tar.gz cpython-f830aa54558b0d4358f427e46171e95c8218f2de.tar.bz2 | |
Emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name
| -rw-r--r-- | Lib/distutils/util.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 2e4617e..0c24e8c 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -6,7 +6,7 @@ one of the other *util.py modules. __revision__ = "$Id$" -import sys, os, string, re, platform +import sys, os, string, re from distutils.errors import DistutilsPlatformError from distutils.dep_util import newer from distutils.spawn import spawn @@ -76,7 +76,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) |