mirror of
https://github.com/python/cpython.git
synced 2025-11-01 06:01:29 +00:00
Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name
This commit is contained in:
parent
2f828f2c88
commit
8874fd6bb0
2 changed files with 5 additions and 0 deletions
|
|
@ -9,6 +9,7 @@
|
||||||
import imp
|
import imp
|
||||||
import sys
|
import sys
|
||||||
import string
|
import string
|
||||||
|
import platform
|
||||||
from distutils.errors import DistutilsPlatformError
|
from distutils.errors import DistutilsPlatformError
|
||||||
from distutils.dep_util import newer
|
from distutils.dep_util import newer
|
||||||
from distutils.spawn import spawn
|
from distutils.spawn import spawn
|
||||||
|
|
@ -77,6 +78,7 @@ def get_platform ():
|
||||||
if release[0] >= "5": # SunOS 5 == Solaris 2
|
if release[0] >= "5": # SunOS 5 == Solaris 2
|
||||||
osname = "solaris"
|
osname = "solaris"
|
||||||
release = "%d.%s" % (int(release[0]) - 3, release[2:])
|
release = "%d.%s" % (int(release[0]) - 3, release[2:])
|
||||||
|
machine += ".%s" % platform.architecture()[0]
|
||||||
# fall through to standard osname-release-machine representation
|
# fall through to standard osname-release-machine representation
|
||||||
elif osname[:4] == "irix": # could be "irix64"!
|
elif osname[:4] == "irix": # could be "irix64"!
|
||||||
return "%s-%s" % (osname, release)
|
return "%s-%s" % (osname, release)
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,9 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #13803: Under Solaris, distutils doesn't include bitness
|
||||||
|
in the directory name.
|
||||||
|
|
||||||
- Issue #13589: Fix some serialization primitives in the aifc module.
|
- Issue #13589: Fix some serialization primitives in the aifc module.
|
||||||
Patch by Oleg Plakhotnyuk.
|
Patch by Oleg Plakhotnyuk.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue