Strip stupid LLVM options

[Gary Benson]

Hi all,

Unlike other *-config scripts, llvm-config does not restrict itself to
include paths and libraries to link.  Instead, it passes all kinds of
options that mess up the HotSpot build: -O3, -Wall, -pedantic, etc.
Previously we have stripped out the worst offenders, but things keep
slipping through.  This patch changes to a whitelist approach, so only
the options we explicitly allow get through.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 748156804502 -r fc600c234771 ChangeLog
--- a/ChangeLog	Tue Feb 09 09:15:27 2010 +0000
+++ b/ChangeLog	Fri Feb 12 13:24:25 2010 +0000
@@ -1,3 +1,7 @@
+2010-02-12  Gary Benson  <gbenson at redhat.com>
+
+	* configure.ac: Strip stupid options that llvm-config supplies.
+
 2010-02-09  Edward Nevill <ed at camswl.com>
 
 	* cppInterpreter_arm.S / thumb2.cpp
diff -r 748156804502 -r fc600c234771 configure.ac
--- a/configure.ac	Tue Feb 09 09:15:27 2010 +0000
+++ b/configure.ac	Fri Feb 12 13:24:25 2010 +0000
@@ -432,12 +432,39 @@
 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_CFLAGS=`$LLVM_CONFIG --cxxflags $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)