From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 29 Aug 2004 16:40:55 +0000 (+0000)
Subject: Patch #973204: Use -rpath instead of -R on Irix and Tru64.
X-Git-Tag: v2.4a3~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=061f132898d3232420db1c00a5adde13647d7e21;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
index a3b1ffa4d5af..e5b9d7cc11c1 100644
--- a/Lib/distutils/ccompiler.py
+++ b/Lib/distutils/ccompiler.py
@@ -1241,7 +1241,11 @@ def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
         lib_opts.append (compiler.library_dir_option (dir))
 
     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!
     # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index 24cbcb53e502..56998c3507e9 100644
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -205,6 +205,8 @@ class UnixCCompiler(CCompiler):
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
             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++":
             return "-Wl,-R" + dir
         else: