Fixed #6164 AIX specific linker argument in Distutils unixcompiler

This commit is contained in:
Tarek Ziadé 2009-06-20 13:57:20 +00:00
parent dae5db2805
commit 439bf93f8c
3 changed files with 28 additions and 16 deletions

View file

@ -86,6 +86,14 @@ class UnixCCompilerTestCase(unittest.TestCase):
sysconfig.get_config_var = gcv
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():
return unittest.makeSuite(UnixCCompilerTestCase)

View file

@ -288,8 +288,7 @@ class UnixCCompiler(CCompiler):
return "+s -L" + dir
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
return ["-rpath", dir]
else:
if compiler[:3] == "gcc" or compiler[:3] == "g++":
elif compiler[:3] == "gcc" or compiler[:3] == "g++":
# gcc on non-GNU systems does not need -Wl, but can
# use it anyway. Since distutils has always passed in
# -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
else:
return "-Wl,-R" + dir
elif sys.platform[:3] == "aix":
return "-blibpath:" + dir
else:
# No idea how --enable-new-dtags would be passed on to
# ld if this system was using GNU ld. Don't know if a

View file

@ -327,6 +327,9 @@ Core and Builtins
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 #6189: Restored compatibility of subprocess.py with Python 2.2.