Merged revisions 74730 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r74730 | tarek.ziade | 2009-09-09 10:48:07 +0200 (Wed, 09 Sep 2009) | 9 lines
Merged revisions 74728 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74728 | tarek.ziade | 2009-09-09 10:14:20 +0200 (Wed, 09 Sep 2009) | 1 line
Issue #6163: Fixed HP-UX runtime library dir options in distutils.unixcompiler
........
................
diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index c11544d..8bbdb4b 100644
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -283,7 +283,9 @@
# MacOSX's linker doesn't understand the -R flag at all
return "-L" + dir
elif sys.platform[:5] == "hp-ux":
- return "+s -L" + dir
+ if "gcc" in compiler or "g++" in compiler:
+ return ["-Wl,+s", "-L" + dir]
+ return ["+s", "-L" + dir]
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
return ["-rpath", dir]
else: