mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-17 15:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 74728 via svnmerge from

Browse source 
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
........
This commit is contained in:
Tarek Ziadé 2009-09-09 08:34:06 +00:00
parent 6acb41bc78
commit aa13a29fde
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/distutils/unixccompiler.py
View file

@ -284,7 +284,9 @@ class UnixCCompiler(CCompiler):
# MacOSX's linker doesn't understand the -R flag at all # MacOSX's linker doesn't understand the -R flag at all
return "-L" + dir return "-L" + dir
elif sys.platform[:5] == "hp-ux": 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": elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
return ["-rpath", dir] return ["-rpath", dir]
elif compiler[:3] == "gcc" or compiler[:3] == "g++": elif compiler[:3] == "gcc" or compiler[:3] == "g++":

4
Misc/NEWS
View file

@ -322,6 +322,10 @@ Core and Builtins
Library Library
------- -------
- Issue #6163: Fixed HP-UX runtime library dir options in
distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and
Michael Haubenwallner.
- Issue #4660: If a multiprocessing.JoinableQueue.put() was preempted, it was - Issue #4660: If a multiprocessing.JoinableQueue.put() was preempted, it was
possible to get a spurious 'task_done() called too many times' error. possible to get a spurious 'task_done() called too many times' error.