traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Jesus Cea 2012-01-18 04:28:05 +01:00
parent 44acda4c97 6e35d417f7
commit 2c5b688081
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/distutils/util.py
View File

@ -9,7 +9,6 @@ import re
import imp import imp
import sys import sys
import string import string
import platform
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
@ -78,7 +77,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)