[Python-checkins] cpython (merge 3.2 -> default): MERGE: Emergency fix for #13803 bootstrap issue: Under Solaris, distutils

[jesus.cea]

http://hg.python.org/cpython/rev/4a6e0b6d493b
changeset:   74484:4a6e0b6d493b
parent:      74481:8d0ccb4ad206
parent:      74483:9d62f5aa35ff
user:        Jesus Cea <jcea at jcea.es>
date:        Wed Jan 18 04:28:05 2012 +0100
summary:
  MERGE: Emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name

files:
  Lib/distutils/util.py |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -9,7 +9,6 @@
 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 @@
         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)

-- 
Repository URL: http://hg.python.org/cpython