* libtool.m4 (_LT_AC_LOCK) [ solaris ]: Add `-64' to $LD if

necessary, to permit combining of several convenience libs
without any further objects added.
Reported by Brian Barrett <brbarret@open-mpi.org>.

diff --git a/ChangeLog b/ChangeLog
index 06724fae71dc46d9fd9ceb5398ee198c7d88f9c0..3d20f4a410010cf452e57b10567713dc8d1a9b1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-01  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * libtool.m4 (_LT_AC_LOCK) [ solaris ]: Add `-64' to $LD if
+       necessary, to permit combining of several convenience libs
+       without any further objects added.
+       Reported by Brian Barrett <brbarret@open-mpi.org>.
+
 2005-11-01  Kean Johnston  <jkj@sco.com>,
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/libtool.m4 b/libtool.m4
index acd1ee09e0e0ee617823d062d9aef9d9838080be..5ce8265b608965a7ec774279c5f31c45627027da 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -574,6 +574,22 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)