/hg/release/icedtea6-1.8: Check for shared LLVM library.

[doko at icedtea.classpath.org]

changeset 5a890a745e14 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=5a890a745e14
author: doko at ubuntu.com
date: Thu Apr 08 17:00:19 2010 +0200

	Check for shared LLVM library.

	2010-04-07 Xerxes R?nby <xerxes at zafena.se>

	 * configure.ac: Updated check for shared LLVM library to
	include svn.

	2010-04-04 Matthias Klose <doko at ubuntu.com>

	 * configure.ac: Check for shared LLVM library.


diffstat:

2 files changed, 20 insertions(+), 1 deletion(-)
ChangeLog    |    8 ++++++++
configure.ac |   13 ++++++++++++-

diffs (61 lines):

diff -r 692a47719141 -r 5a890a745e14 ChangeLog
--- a/ChangeLog	Thu Apr 08 11:59:38 2010 +0100
+++ b/ChangeLog	Thu Apr 08 17:00:19 2010 +0200
@@ -1,3 +1,11 @@ 2010-04-08  Andrew John Hughes  <ahughes
+2010-04-07  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* configure.ac: Updated check for shared LLVM library to include svn.
+
+2010-04-04  Matthias Klose  <doko at ubuntu.com>
+
+	* configure.ac: Check for shared LLVM library.
+
 2010-04-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Remove remaining references to
diff -r 692a47719141 -r 5a890a745e14 configure.ac
--- a/configure.ac	Thu Apr 08 11:59:38 2010 +0100
+++ b/configure.ac	Thu Apr 08 17:00:19 2010 +0200
@@ -440,6 +440,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
 if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
   FIND_TOOL([LLVM_CONFIG], [llvm-config])
   llvm_components="jit engine nativecodegen"
+  LLVM_VERSION="`$LLVM_CONFIG --version`"
   dnl LLVM_CFLAGS
   LLVM_CFLAGS=
   for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do
@@ -452,6 +453,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
       fi
     fi
   done
+  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`echo $LLVM_VERSION | sed 's/\.//;s/svn.*//'`"
   dnl LLVM_LDFLAGS
   LLVM_LDFLAGS=
   for flag in $($LLVM_CONFIG --ldflags $llvm_components); do
@@ -463,8 +465,17 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
     fi
   done
   dnl LLVM_LIBS
+  LIBS_SAVED=$LIBS
+  LDFLAGS_SAVED=$LDFLAGS
+  LDFLAGS=$LLVM_LDFLAGS
+  AC_CHECK_LIB(LLVM-$LLVM_VERSION, LLVMGetNextInstruction,LLVM_SHARED_LIB=" -lLLVM-$LLVM_VERSION")
+  LIBS=$LIBS_SAVED
+  LDFLAGS=$LDFLAGS_SAVED
   LLVM_LIBS=
   for flag in $($LLVM_CONFIG --libs $llvm_components); do
+    if test "x$LLVM_SHARED_LIB" != x && echo "$flag" | grep -q '^-lLLVM'; then
+      continue
+    fi
     if echo "$flag" | grep -q '^-l'; then
       if test "x$LLVM_LIBS" != "x"; then
         LLVM_LIBS="$LLVM_LIBS "
@@ -472,7 +483,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
       LLVM_LIBS="$LLVM_LIBS$flag"
     fi
   done
-  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`"
+  LLVM_LIBS="$LLVM_LIBS$LLVM_SHARED_LIB"
 fi
 AC_SUBST(LLVM_CFLAGS)
 AC_SUBST(LLVM_LDFLAGS)