mirror of
https://github.com/python/cpython.git
synced 2025-09-23 08:53:45 +00:00
Fixed #6164 AIX specific linker argument in Distutils unixcompiler
This commit is contained in:
parent
dae5db2805
commit
439bf93f8c
3 changed files with 28 additions and 16 deletions
|
@ -86,6 +86,14 @@ class UnixCCompilerTestCase(unittest.TestCase):
|
||||||
sysconfig.get_config_var = gcv
|
sysconfig.get_config_var = gcv
|
||||||
self.assertEqual(self.cc.rpath_foo(), '-R/foo')
|
self.assertEqual(self.cc.rpath_foo(), '-R/foo')
|
||||||
|
|
||||||
|
# AIX C/C++ linker
|
||||||
|
sys.platform = 'aix'
|
||||||
|
def gcv(v):
|
||||||
|
return 'xxx'
|
||||||
|
sysconfig.get_config_var = gcv
|
||||||
|
self.assertEqual(self.cc.rpath_foo(), '-blibpath:/foo')
|
||||||
|
|
||||||
|
|
||||||
def test_suite():
|
def test_suite():
|
||||||
return unittest.makeSuite(UnixCCompilerTestCase)
|
return unittest.makeSuite(UnixCCompilerTestCase)
|
||||||
|
|
||||||
|
|
|
@ -288,8 +288,7 @@ class UnixCCompiler(CCompiler):
|
||||||
return "+s -L" + dir
|
return "+s -L" + dir
|
||||||
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
|
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
|
||||||
return ["-rpath", dir]
|
return ["-rpath", dir]
|
||||||
else:
|
elif compiler[:3] == "gcc" or compiler[:3] == "g++":
|
||||||
if compiler[:3] == "gcc" or compiler[:3] == "g++":
|
|
||||||
# gcc on non-GNU systems does not need -Wl, but can
|
# gcc on non-GNU systems does not need -Wl, but can
|
||||||
# use it anyway. Since distutils has always passed in
|
# use it anyway. Since distutils has always passed in
|
||||||
# -Wl whenever gcc was used in the past it is probably
|
# -Wl whenever gcc was used in the past it is probably
|
||||||
|
@ -300,6 +299,8 @@ class UnixCCompiler(CCompiler):
|
||||||
return "-Wl,--enable-new-dtags,-R" + dir
|
return "-Wl,--enable-new-dtags,-R" + dir
|
||||||
else:
|
else:
|
||||||
return "-Wl,-R" + dir
|
return "-Wl,-R" + dir
|
||||||
|
elif sys.platform[:3] == "aix":
|
||||||
|
return "-blibpath:" + dir
|
||||||
else:
|
else:
|
||||||
# No idea how --enable-new-dtags would be passed on to
|
# No idea how --enable-new-dtags would be passed on to
|
||||||
# ld if this system was using GNU ld. Don't know if a
|
# ld if this system was using GNU ld. Don't know if a
|
||||||
|
|
|
@ -327,6 +327,9 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #6164: Added an AIX specific linker argument in Distutils
|
||||||
|
unixcompiler. Original patch by Sridhar Ratnakumar.
|
||||||
|
|
||||||
- Issue #6274: Fixed possible file descriptors leak in subprocess.py
|
- Issue #6274: Fixed possible file descriptors leak in subprocess.py
|
||||||
|
|
||||||
- Issue #6189: Restored compatibility of subprocess.py with Python 2.2.
|
- Issue #6189: Restored compatibility of subprocess.py with Python 2.2.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue