changeset: 74492:582274636446 parent: 74490:afdce2e2f98d parent: 74491:147ad02875fa user: Jesus Cea date: Wed Jan 18 05:05:41 2012 +0100 files: Lib/sysconfig.py description: MERGE: And yet another emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name diff -r afdce2e2f98d -r 582274636446 Lib/distutils/util.py --- a/Lib/distutils/util.py Wed Jan 18 04:49:54 2012 +0100 +++ b/Lib/distutils/util.py Wed Jan 18 05:05:41 2012 +0100 @@ -81,7 +81,7 @@ # bootstrap problem. We use a dict to get an error # if some suspicious happens. bitness = {2147483647:"32bit", 9223372036854775807:"64bit"} - machine += ".%s" % bitness[sys.maxint] + machine += ".%s" % bitness[sys.maxsize] # fall through to standard osname-release-machine representation elif osname[:4] == "irix": # could be "irix64"! return "%s-%s" % (osname, release) diff -r afdce2e2f98d -r 582274636446 Lib/sysconfig.py --- a/Lib/sysconfig.py Wed Jan 18 04:49:54 2012 +0100 +++ b/Lib/sysconfig.py Wed Jan 18 05:05:41 2012 +0100 @@ -656,7 +656,7 @@ # bootstrap problem. We use a dict to get an error # if some suspicious happens. bitness = {2147483647:"32bit", 9223372036854775807:"64bit"} - machine += ".%s" % bitness[sys.maxint] + machine += ".%s" % bitness[sys.maxsize] # fall through to standard osname-release-machine representation elif osname[:4] == "irix": # could be "irix64"! return "%s-%s" % (osname, release)