From: Jesus Cea <jcea@jcea.es>
Date: Wed, 18 Jan 2012 02:58:42 +0000 (+0100)
Subject: Closes #13803: Under Solaris, distutils doesn't include bitness in the directory... 
X-Git-Tag: v3.2.3rc1~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8874fd6bb0289ae1417db8e8b79f72a99f13079f;p=thirdparty%2FPython%2Fcpython.git

Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name
---

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index f42c6a18b945..36c4a68494d8 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 4bdf4184a31b..bceed4665335 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.