* libltdl/m4/libtool.m4 (_LT_ENABLE_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 0f93d39b9ed9264e58c5d4bf937b4d3894d1f76f..533376c690707176f9d52ec703ec38aca86f456d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-01  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/m4/libtool.m4 (_LT_ENABLE_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/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 964202da6b25f47284e942e0445dc7f742264018..728be3e2776448a00c86e03ab336cf38683be639 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1167,6 +1167,21 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|s390*-*tpf*|sparc*-*l
     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*
+  ;;
 esac
 
 need_locks="$enable_libtool_lock"