changeset in /hg/icedtea6: 2009-05-05 Xerxes R<C3><A5>nby <xerxe...

[doko at ubuntu.com]

changeset 3ec346e55f66 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3ec346e55f66
description:
	2009-05-05 Xerxes R<C3><A5>nby <xerxes at zafena.se>

	        * configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from
	        SHARK_LLVM_VERSION.

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog    |    5 +++++
configure.ac |    2 +-

diffs (24 lines):

diff -r 286d83b611a6 -r 3ec346e55f66 ChangeLog
--- a/ChangeLog	Mon May 04 16:25:07 2009 +0200
+++ b/ChangeLog	Tue May 05 02:11:58 2009 +0200
@@ -1,3 +1,8 @@ 2009-05-04  Matthias Klose  <doko at ubuntu
+2009-05-05 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+	* configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from
+	SHARK_LLVM_VERSION.
+
 2009-05-04  Matthias Klose  <doko at ubuntu.com>
 
 	* autogen.sh: Check for autom4te, check variants of versioned commands.
diff -r 286d83b611a6 -r 3ec346e55f66 configure.ac
--- a/configure.ac	Mon May 04 16:25:07 2009 +0200
+++ b/configure.ac	Tue May 05 02:11:58 2009 +0200
@@ -565,7 +565,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
   LLVM_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \
     sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \
     sed -e 's/-D_DEBUG//g'`
-  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//'`"
+  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`"
   LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components`
   LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components`
 fi