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

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

diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
index 751ec0694bcd..905543f4fe57 100644
--- a/Lib/distutils/ccompiler.py
+++ b/Lib/distutils/ccompiler.py
@@ -1237,7 +1237,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 11ecb9f6aec3..a9c43d3712ed 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:
diff --git a/Misc/NEWS b/Misc/NEWS
index f64e33a47182..0b2675c7b28a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -119,6 +119,9 @@ Tools/Demos
 Build
 -----
 
+- Patch #973204: Use -rpath instead of -R for runtime_library_dirs 
+  on Irix and True64.
+
 - Bug #978645: Modules/getpath.c now builds properly under --disable-framework
   build under OS X.