summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesus Cea <jcea@jcea.es>2012-01-18 03:58:42 +0100
committerJesus Cea <jcea@jcea.es>2012-01-18 03:58:42 +0100
commit8874fd6bb0289ae1417db8e8b79f72a99f13079f (patch)
tree20667137932a7fa24fb6712170fb83b22cba2147
parent2f828f2c8859b331bf9519bdc660eb8a2288779a (diff)
downloadcpython-git-8874fd6bb0289ae1417db8e8b79f72a99f13079f.tar.gz
Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name
-rw-r--r--Lib/distutils/util.py2
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index f42c6a18b9..36c4a68494 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)
diff --git a/Misc/NEWS b/Misc/NEWS
index 4bdf4184a3..bceed46653 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -100,6 +100,9 @@ Core and Builtins
Library
-------
+- Issue #13803: Under Solaris, distutils doesn't include bitness
+ in the directory name.
+
- Issue #13589: Fix some serialization primitives in the aifc module.
Patch by Oleg Plakhotnyuk.