* ltmain.in (link mode): Disregard

`hardcode_libdir_flag_spec_ld' if we're using `$CC' to link.
* libtool.m4 () [ hpux10, hpux11; hppa*64*, ia64* ]
<hardcode_libdir_flag_spec_ld>: Removed.
Reported by Roger While <simrw@sim-basis.de>.

diff --git a/ChangeLog b/ChangeLog
index 85a75b8c0ef300f65e4374ac25e784995426eab2..5ec755116385d7bb34e8edc8d545577369c23983 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * ltmain.in (link mode): Disregard
+       `hardcode_libdir_flag_spec_ld' if we're using `$CC' to link.
+       * libtool.m4 () [ hpux10, hpux11; hppa*64*, ia64* ]
+       <hardcode_libdir_flag_spec_ld>: Removed.
+       Reported by Roger While <simrw@sim-basis.de>.
+
 2006-06-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * ltmain.in (link mode): Honor `-threads', similar to `-mt'.

diff --git a/libtool.m4 b/libtool.m4
index e317cf363aba3bd9e446b2460083789bb4b0faab..b7f864d40f7506c2a339175066b0c9d1ccae267d 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -3178,9 +3178,7 @@ case $host_os in
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;

diff --git a/ltmain.in b/ltmain.in
index 09d65f17d7414be3f2b9ca71e0705d5ae1076ba0..21c56a32933ccd88514da51829f87fef96c74458 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -3919,7 +3919,10 @@ EOF
             test -n "$hardcode_libdirs"; then
            libdir="$hardcode_libdirs"
            if test -n "$hardcode_libdir_flag_spec_ld"; then
-             eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+             case $archive_cmds in
+             *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+             *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+             esac
            else
              eval dep_rpath=\"$hardcode_libdir_flag_spec\"
            fi