diff options
| author | Jesus Cea <jcea@jcea.es> | 2012-01-18 03:01:24 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2012-01-18 03:01:24 (GMT) |
| commit | 44acda4c971f0e565b6e52dbb51267c7255662f9 (patch) | |
| tree | 447736e03eeb28aac479b90bfbd01ea78b95cabf | |
| parent | e39ebe45c4953ff506a1f7bd5c115b5c1b8e66d7 (diff) | |
| parent | 8874fd6bb0289ae1417db8e8b79f72a99f13079f (diff) | |
| download | cpython-44acda4c971f0e565b6e52dbb51267c7255662f9.zip cpython-44acda4c971f0e565b6e52dbb51267c7255662f9.tar.gz cpython-44acda4c971f0e565b6e52dbb51267c7255662f9.tar.bz2 | |
MERGE: Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name
| -rw-r--r-- | Lib/distutils/util.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index f42c6a1..36c4a68 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -9,6 +9,7 @@ import re import imp import sys import string +import platform from distutils.errors import DistutilsPlatformError from distutils.dep_util import newer from distutils.spawn import spawn @@ -77,6 +78,7 @@ 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] # fall through to standard osname-release-machine representation elif osname[:4] == "irix": # could be "irix64"! return "%s-%s" % (osname, release) @@ -447,6 +447,9 @@ Core and Builtins Library ------- +- Issue #13803: Under Solaris, distutils doesn't include bitness + in the directory name. + - Issue #10278: Add time.wallclock() function, monotonic clock. - Issue #13809: Fix regression where bz2 module wouldn't work when threads are |