(original) (raw)

changeset: 74490:afdce2e2f98d parent: 74487:0c0ffebfccb0 parent: 74489:37efae3bf912 user: Jesus Cea jcea@jcea.es date: Wed Jan 18 04:49:54 2012 +0100 files: Lib/sysconfig.py description: MERGE: Yet another emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name diff -r 0c0ffebfccb0 -r afdce2e2f98d Lib/sysconfig.py --- a/Lib/sysconfig.py Wed Jan 18 05:43:21 2012 +0200 +++ b/Lib/sysconfig.py Wed Jan 18 04:49:54 2012 +0100 @@ -652,6 +652,11 @@ if release[0] >= "5": # SunOS 5 == Solaris 2 osname = "solaris" release = "%d.%s" % (int(release[0]) - 3, release[2:]) + # 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) /jcea@jcea.es