[Python-checkins] python/dist/src/Lib/distutils ccompiler.py, 1.57, 1.57.10.1 unixccompiler.py, 1.54, 1.54.8.1

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24834/Lib/distutils

Modified Files:
      Tag: release23-maint
	ccompiler.py unixccompiler.py 
Log Message:
Patch #973204: Use -rpath instead of -R on Irix and True64.


Index: ccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/ccompiler.py,v
retrieving revision 1.57
retrieving revision 1.57.10.1
diff -u -d -r1.57 -r1.57.10.1
--- ccompiler.py	24 Apr 2003 19:49:23 -0000	1.57
+++ ccompiler.py	29 Aug 2004 16:45:13 -0000	1.57.10.1
@@ -1237,7 +1237,11 @@
         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

Index: unixccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/unixccompiler.py,v
retrieving revision 1.54
retrieving revision 1.54.8.1
diff -u -d -r1.54 -r1.54.8.1
--- unixccompiler.py	1 Jun 2003 19:27:40 -0000	1.54
+++ unixccompiler.py	29 Aug 2004 16:45:13 -0000	1.54.8.1
@@ -205,6 +205,8 @@
             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: