mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 19:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Patch #973204: Use -rpath instead of -R on Irix and Tru64.

Browse source
This commit is contained in:
Martin v. Löwis 2004-08-29 16:40:55 +00:00
parent e064b41f5a
commit 061f132898
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/ccompiler.py
View file

@ -1241,7 +1241,11 @@ def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
lib_opts.append (compiler.library_dir_option (dir)) lib_opts.append (compiler.library_dir_option (dir))
for dir in runtime_library_dirs: for dir in runtime_library_dirs:
lib_opts.append (compiler.runtime_library_dir_option (dir)) opt = compiler.runtime_library_dir_option (dir)
if type(opt) is ListType:
lib_opts = lib_opts + opt
else:
lib_opts.append (opt)
# XXX it's important that we *not* remove redundant library mentions! # XXX it's important that we *not* remove redundant library mentions!
# sometimes you really do have to say "-lfoo -lbar -lfoo" in order to # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to

2
Lib/distutils/unixccompiler.py
View file

@ -205,6 +205,8 @@ class UnixCCompiler(CCompiler):
return "-L" + dir return "-L" + dir
elif sys.platform[:5] == "hp-ux": elif sys.platform[:5] == "hp-ux":
return "+s -L" + dir return "+s -L" + dir
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
return ["-rpath", dir]
elif compiler[:3] == "gcc" or compiler[:3] == "g++": elif compiler[:3] == "gcc" or compiler[:3] == "g++":
return "-Wl,-R" + dir return "-Wl,-R" + dir
else: else: