From: Ralf Wildenhues Date: Mon, 12 Jun 2006 05:25:26 +0000 (+0000) Subject: * ltmain.in (link mode): Disregard X-Git-Tag: release-1-5-23b~34 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ae630531c101758f43e2f92240cf12b15a00b174;p=thirdparty%2Flibtool.git * ltmain.in (link mode): Disregard `hardcode_libdir_flag_spec_ld' if we're using `$CC' to link. * libtool.m4 () [ hpux10, hpux11; hppa*64*, ia64* ] : Removed. Reported by Roger While . --- diff --git a/ChangeLog b/ChangeLog index 85a75b8c0..5ec755116 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-06-12 Ralf Wildenhues + + * ltmain.in (link mode): Disregard + `hardcode_libdir_flag_spec_ld' if we're using `$CC' to link. + * libtool.m4 () [ hpux10, hpux11; hppa*64*, ia64* ] + : Removed. + Reported by Roger While . + 2006-06-08 Ralf Wildenhues * ltmain.in (link mode): Honor `-threads', similar to `-mt'. diff --git a/libtool.m4 b/libtool.m4 index e317cf363..b7f864d40 100644 --- 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 09d65f17d..21c56a329 100644 --- 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