* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG)

[ hpux11 ]: Pass +nodefaultrpath when linking on ia64*.

diff --git a/ChangeLog b/ChangeLog
index f5758f2dba96faf444d3d9cd16073e90f108f226..0f748c7b09a65d340a7540e5f78e1ca4241e9989 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-14  Albert Chin  <china@thewrittenword.com>
+
+       * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG)
+       [ hpux11 ]: Pass +nodefaultrpath when linking on ia64*.
+
 2005-11-14  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        Testsuite portability update round.

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index e8c5559db7ca21aa6f737f1b53dc58293857d292..4918a40c70dc5ee4aa116e4273ad52d8b81cd502 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -4434,18 +4434,24 @@ _LT_EOF
     hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
        case $host_cpu in
-       hppa*64*|ia64*)
+       hppa*64*)
          _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
          ;;
+       ia64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
        *)
          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
          ;;
        esac
       else
        case $host_cpu in
-       hppa*64*|ia64*)
+       hppa*64*)
          _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
          ;;
+       ia64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
        *)
          _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
          ;;
@@ -5460,9 +5466,12 @@ if test "$_lt_caught_CXX_error" != yes; then
            ;;
           aCC*)
            case $host_cpu in
-             hppa*64*|ia64*)
+             hppa*64*)
                _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
                ;;
+             ia64*)
+               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
              *)
                _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
                ;;
@@ -5481,9 +5490,12 @@ if test "$_lt_caught_CXX_error" != yes; then
            if test "$GXX" = yes; then
              if test $with_gnu_ld = no; then
                case $host_cpu in
-                 ia64*|hppa*64*)
+                 hppa*64*)
                    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
                    ;;
+                 ia64*)
+                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
                  *)
                    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
                    ;;