summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2017-09-04 23:36:05 (GMT)
committerGitHub <noreply@github.com>2017-09-04 23:36:05 (GMT)
commit069306312addf87252e2dbf250fc7632fc8b7da3 (patch)
tree92917032b65208b37ce8aeca6011d3eea30ce205 /Lib/distutils
parente1b0287c0440399e8cc855897113614fa5f6bc96 (diff)
downloadcpython-069306312addf87252e2dbf250fc7632fc8b7da3.zip
cpython-069306312addf87252e2dbf250fc7632fc8b7da3.tar.gz
cpython-069306312addf87252e2dbf250fc7632fc8b7da3.tar.bz2
remove IRIX support (closes bpo-31341) (#3310)
See PEP 11.
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/tests/test_unixccompiler.py8
-rw-r--r--Lib/distutils/unixccompiler.py2
-rw-r--r--Lib/distutils/util.py19
3 files changed, 7 insertions, 22 deletions
diff --git a/Lib/distutils/tests/test_unixccompiler.py b/Lib/distutils/tests/test_unixccompiler.py
index efba27e..eef702c 100644
--- a/Lib/distutils/tests/test_unixccompiler.py
+++ b/Lib/distutils/tests/test_unixccompiler.py
@@ -51,14 +51,6 @@ class UnixCCompilerTestCase(unittest.TestCase):
sysconfig.get_config_var = old_gcv
- # irix646
- sys.platform = 'irix646'
- self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
-
- # osf1V5
- sys.platform = 'osf1V5'
- self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
-
# GCC GNULD
sys.platform = 'bar'
def gcv(v):
diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index 3f321c2..ab4d4de 100644
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -233,8 +233,6 @@ class UnixCCompiler(CCompiler):
if self._is_gcc(compiler):
return ["-Wl,+s", "-L" + dir]
return ["+s", "-L" + dir]
- elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
- return ["-rpath", dir]
else:
if self._is_gcc(compiler):
# gcc on non-GNU systems does not need -Wl, but can
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index fdcf6fa..b8a6911 100644
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -16,21 +16,17 @@ from distutils import log
from distutils.errors import DistutilsByteCompileError
def get_platform ():
- """Return a string that identifies the current platform. This is used
- mainly to distinguish platform-specific build directories and
- platform-specific built distributions. Typically includes the OS name
- and version and the architecture (as supplied by 'os.uname()'),
- although the exact information included depends on the OS; eg. for IRIX
- the architecture isn't particularly important (IRIX only runs on SGI
- hardware), but for Linux the kernel version isn't particularly
- important.
+ """Return a string that identifies the current platform. This is used mainly to
+ distinguish platform-specific build directories and platform-specific built
+ distributions. Typically includes the OS name and version and the
+ architecture (as supplied by 'os.uname()'), although the exact information
+ included depends on the OS; eg. on Linux, the kernel version isn't
+ particularly important.
Examples of returned values:
linux-i586
linux-alpha (?)
solaris-2.6-sun4u
- irix-5.3
- irix64-6.2
Windows will return one of:
win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
@@ -38,6 +34,7 @@ def get_platform ():
win32 (all others - specifically, sys.platform is returned)
For other non-POSIX platforms, currently just returns 'sys.platform'.
+
"""
if os.name == 'nt':
# sniff sys.version for architecture.
@@ -87,8 +84,6 @@ def get_platform ():
bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
machine += ".%s" % bitness[sys.maxsize]
# fall through to standard osname-release-machine representation
- elif osname[:4] == "irix": # could be "irix64"!
- return "%s-%s" % (osname, release)
elif osname[:3] == "aix":
return "%s-%s.%s" % (osname, version, release)
elif osname[:6] == "cygwin":