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

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index 6c49f0b1cbace27d40fbebc76b52b6d8047ac5f4..2e4617ef277f10c0a369445fe52156169a167f38 100644 (file)
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -6,7 +6,7 @@ one of the other *util.py modules.
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, string, re, platform
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -76,6 +76,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 6ebacc99c952bcaeba2137f2c84e9745a9a41035..9d32b125592ca47d07fb02e8bb65701e320591d6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,9 @@ Library
 - Issue #13589: Fix some serialization primitives in the aifc module.
   Patch by Oleg Plakhotnyuk.
 
+- Issue #13803: Under Solaris, distutils doesn't include bitness
+  in the directory name.
+
 - Issue #13642: Unquote before b64encoding user:password during Basic
   Authentication. Patch contributed by Joonas Kuorilehto and Michele Orrù.