mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 00:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name

Browse source
This commit is contained in:
Jesus Cea 2012-01-18 04:25:28 +01:00
parent 4a8ba19783
commit f830aa5455
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/distutils/util.py
View file

@ -6,7 +6,7 @@ one of the other *util.py modules.
__revision__ = "$Id$" __revision__ = "$Id$"
import sys, os, string, re, platform import sys, os, string, re
from distutils.errors import DistutilsPlatformError from distutils.errors import DistutilsPlatformError
from distutils.dep_util import newer from distutils.dep_util import newer
from distutils.spawn import spawn from distutils.spawn import spawn
@ -76,7 +76,11 @@ def get_platform ():
if release[0] >= "5": # SunOS 5 == Solaris 2 if release[0] >= "5": # SunOS 5 == Solaris 2
osname = "solaris" osname = "solaris"
release = "%d.%s" % (int(release[0]) - 3, release[2:]) 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 # fall through to standard osname-release-machine representation
elif osname[:4] == "irix": # could be "irix64"! elif osname[:4] == "irix": # could be "irix64"!
return "%s-%s" % (osname, release) return "%s-%s" % (osname, release)