Emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name
This commit is contained in:
parent
4a8ba19783
commit
f830aa5455
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue