Mercurial > hg > release > icedtea-1.10
changeset 1788:dd44934ab114
Shark merge.
2009-05-05 Xerxes R?nby <xerxes@zafena.se>
* configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from
SHARK_LLVM_VERSION.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Tue, 19 May 2009 16:19:49 +0100 |
parents | 05e7319d1854 |
children | 7ecb9ff6ed05 |
files | ChangeLog configure.ac |
diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 01 05:17:26 2009 -0400 +++ b/ChangeLog Tue May 19 16:19:49 2009 +0100 @@ -1,3 +1,8 @@ +2009-05-05 Xerxes RĂ„nby <xerxes@zafena.se> + + * configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from + SHARK_LLVM_VERSION. + 2009-05-01 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file.
--- a/configure.ac Fri May 01 05:17:26 2009 -0400 +++ b/configure.ac Tue May 19 16:19:49 2009 +0100 @@ -542,6 +542,7 @@ 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/\.//;s/svn.*//'`" LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components` LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components` fi