Mercurial > hg > release > icedtea7-2.0
changeset 2163:4d70695b8a8a
Strip stupid options that llvm-config supplies
2010-02-12 Gary Benson <gbenson@redhat.com>
* configure.ac: Strip stupid options that llvm-config supplies.
author | Gary Benson <gbenson@redhat.com> |
---|---|
date | Thu, 20 May 2010 14:21:12 +0100 |
parents | 5fe7d106e8c7 |
children | ad06363a6947 |
files | ChangeLog configure.ac |
diffstat | 2 files changed, 36 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 03 11:59:46 2010 -0500 +++ b/ChangeLog Thu May 20 14:21:12 2010 +0100 @@ -1,3 +1,7 @@ +2010-02-12 Gary Benson <gbenson@redhat.com> + + * configure.ac: Strip stupid options that llvm-config supplies. + 2010-02-03 Deepak Bhole <dbhole@redhat.com> * plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/configure.ac Wed Feb 03 11:59:46 2010 -0500 +++ b/configure.ac Thu May 20 14:21:12 2010 +0100 @@ -447,12 +447,39 @@ if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then FIND_TOOL([LLVM_CONFIG], [llvm-config]) llvm_components="engine nativecodegen" - LLVM_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \ - sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \ - sed -e 's/-pedantic//g' | sed -e 's/-D_DEBUG//g'` + dnl LLVM_CFLAGS + LLVM_CFLAGS= + for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do + if echo "$flag" | grep -q '^-[[ID]]'; then + if test "$flag" != "-D_DEBUG"; then + if test "x$LLVM_CFLAGS" != "x"; then + LLVM_CFLAGS="$LLVM_CFLAGS " + fi + LLVM_CFLAGS="$LLVM_CFLAGS$flag" + fi + fi + done + dnl LLVM_LDFLAGS + LLVM_LDFLAGS= + for flag in $($LLVM_CONFIG --ldflags $llvm_components); do + if echo "$flag" | grep -q '^-L'; then + if test "x$LLVM_LDFLAGS" != "x"; then + LLVM_LDFLAGS="$LLVM_LDFLAGS " + fi + LLVM_LDFLAGS="$LLVM_LDFLAGS$flag" + fi + done + dnl LLVM_LIBS + LLVM_LIBS= + for flag in $($LLVM_CONFIG --libs $llvm_components); do + if echo "$flag" | grep -q '^-l'; then + if test "x$LLVM_LIBS" != "x"; then + LLVM_LIBS="$LLVM_LIBS " + fi + LLVM_LIBS="$LLVM_LIBS$flag" + fi + done 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 AC_SUBST(LLVM_CFLAGS) AC_SUBST(LLVM_LDFLAGS)