libtool ChangeLog libtool.m4 ltmain.in [branch-1-5]

[Ralf Wildenhues]

CVSROOT:        /cvsroot/libtool
Module name:    libtool
Branch:         branch-1-5
Changes by:     Ralf Wildenhues <rwild> 06/06/12 05:25:26

Modified files:
        .              : ChangeLog libtool.m4 ltmain.in 

Log message:
        * 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 <address@hidden>.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libtool/ChangeLog?cvsroot=libtool&only_with_tag=branch-1-5&r1=1.1220.2.402&r2=1.1220.2.403
http://cvs.savannah.gnu.org/viewcvs/libtool/libtool.m4?cvsroot=libtool&only_with_tag=branch-1-5&r1=1.314.2.157&r2=1.314.2.158
http://cvs.savannah.gnu.org/viewcvs/libtool/ltmain.in?cvsroot=libtool&only_with_tag=branch-1-5&r1=1.334.2.131&r2=1.334.2.132

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/libtool/libtool/ChangeLog,v
retrieving revision 1.1220.2.402
retrieving revision 1.1220.2.403
diff -u -b -r1.1220.2.402 -r1.1220.2.403
--- ChangeLog   8 Jun 2006 16:55:10 -0000       1.1220.2.402
+++ ChangeLog   12 Jun 2006 05:25:25 -0000      1.1220.2.403
@@ -1,3 +1,11 @@
+2006-06-12  Ralf Wildenhues  <address@hidden>
+
+       * 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 <address@hidden>.
+
 2006-06-08  Ralf Wildenhues  <address@hidden>
 
        * ltmain.in (link mode): Honor `-threads', similar to `-mt'.
@@ -4497,4 +4505,4 @@
 
 Continued in ChangeLog.1
 
-       $Revision: 1.1220.2.402 $ $Date: 2006/06/08 16:55:10 $
+       $Revision: 1.1220.2.403 $ $Date: 2006/06/12 05:25:25 $

Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.157
retrieving revision 1.314.2.158
diff -u -b -r1.314.2.157 -r1.314.2.158
--- libtool.m4  1 Jun 2006 18:46:12 -0000       1.314.2.157
+++ libtool.m4  12 Jun 2006 05:25:26 -0000      1.314.2.158
@@ -3178,9 +3178,7 @@
       _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'
         ;;

Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.131
retrieving revision 1.334.2.132
diff -u -b -r1.334.2.131 -r1.334.2.132
--- ltmain.in   8 Jun 2006 16:55:10 -0000       1.334.2.131
+++ ltmain.in   12 Jun 2006 05:25:26 -0000      1.334.2.132
@@ -3919,7 +3919,10 @@
             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