]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
* libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG)
authorAlbert Chin-A-Young <china@thewrittenword.com>
Mon, 7 Nov 2005 18:29:01 +0000 (18:29 +0000)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Mon, 7 Nov 2005 18:29:01 +0000 (18:29 +0000)
(AC_LIBTOOL_PROG_LD_SHLIBS) [ hpux10, hpux11 ]:
hardcode_libdir_flag_spec and hardcode_minus_L are the same for
hppa*64 and ia64*. Don't set
hardcode_libdir_flag_spec='-L$libdir' on ia64* because if you
specify +b and -L, +b overrides what is set into DT_RPATH.

ChangeLog
libtool.m4

index adfa116a72da4c3731662f92d967d82d7299056e..4ff6f5c2795cb0182a3bbdbc3436dd7bb9c87f04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-07  Albert Chin-A-Young  <china@thewrittenword.com>
+
+       * libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG)
+       (AC_LIBTOOL_PROG_LD_SHLIBS) [ hpux10, hpux11 ]:
+       hardcode_libdir_flag_spec and hardcode_minus_L are the same for
+       hppa*64 and ia64*. Don't set
+       hardcode_libdir_flag_spec='-L$libdir' on ia64* because if you
+       specify +b and -L, +b overrides what is set into DT_RPATH.
+
 2005-11-06  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libtool.m4 (_LT_AC_TRY_DLOPEN_SELF): lt_unknown is
index c45efe995213a2719d72e4082771e04ca19c2aab..5b9b34923e604c0426d7393cac03979caed6e5c8 100644 (file)
@@ -3143,33 +3143,22 @@ case $host_os in
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
       case $host_cpu in
-      hppa*64*)
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      hppa*64*|ia64*)
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-        ;;
-      ia64*)
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
         ;;
       *)
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
       esac
     fi
     case $host_cpu in
-    hppa*64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    ia64*)
+    hppa*64*|ia64*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-                                             # but as the default
-                                             # location of the library.
       ;;
     *)
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -5822,26 +5811,16 @@ EOF
        esac
       fi
       if test "$with_gnu_ld" = no; then
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
        case $host_cpu in
-       hppa*64*)
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       hppa*64*|ia64*)
          _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-         _LT_AC_TAGVAR(hardcode_direct, $1)=no
-         _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-         ;;
-       ia64*)
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
          _LT_AC_TAGVAR(hardcode_direct, $1)=no
          _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
-         # hardcode_minus_L: Not really in the search PATH,
-         # but as the default location of the library.
-         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
          ;;
        *)
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
          _LT_AC_TAGVAR(hardcode_direct, $1)=yes
          _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'