libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

pass new subdir tests


From: Peter O'Gorman
Subject: pass new subdir tests
Date: Tue, 19 Oct 2004 23:39:29 +0900
User-agent: Mozilla Thunderbird 0.7.3 (Macintosh/20040803)

This seems to be working for me, though it is not yet finished the tests (must remember to order a new mac).

Assuming the remaining tests pass, is it okay to commit this to HEAD?

Peter
--
Peter O'Gorman - http://www.pogma.com

Index: ChangeLog
2004-10-19  Peter O'Gorman  <address@hidden>

        * config/ltmain.m4sh (func_mode_link): Make Gary's new tests
        pass. When the output wrapper script is not in the current
        directory, we can not use an rpath which is relative to the
        current directory. Use an absolute path instead.

from  Gary V. Vaughan  <address@hidden>
Index: config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/config/ltmain.m4sh,v
retrieving revision 1.11
diff -u -3 -p -u -r1.11 ltmain.m4sh
--- config/ltmain.m4sh 16 Oct 2004 15:02:05 -0000 1.11
+++ config/ltmain.m4sh 19 Oct 2004 14:23:19 -0000
@@ -5502,7 +5502,17 @@ EOF
            ;;
          *)
            # Relative path: add a thisdir entry.
-           rpath="$rpath\$thisdir/$dir:"
+               case "$output" in
+               *[[\\/]]*)
+                 # the output file is not in the current dir
+                 # so we need an absolute path.
+                 absdir=`cd "$dir" && pwd`
+                 rpath="$rpath$absdir:"
+                 ;;
+               *)
+                 rpath="$rpath\$thisdir/$dir:"
+             ;;
+           esac
            ;;
          esac
        done

reply via email to

[Prev in Thread] Current Thread [Next in Thread]