Mesa (master): Fix build with LLVM >= r145623.

Brian Paul brianp at kemper.freedesktop.org
Mon Dec 26 15:13:31 PST 2011


Module: Mesa
Branch: master
Commit: aa284042a3116224f623ce8ec1680997c6818827
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa284042a3116224f623ce8ec1680997c6818827

Author: Johannes Obermayr <johannesobermayr at gmx.de>
Date:   Mon Dec 19 23:11:46 2011 +0100

Fix build with LLVM >= r145623.

This is a workaround for https://bugs.freedesktop.org/show_bug.cgi?id=43861.

Actually the issue which makes -pedantic failing should be solved.

Reviewed-by: Michel Dänzer <michel at daenzer.net>
Signed-off-by: Brian Paul <brianp at vmware.com>

---

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index a4943e1..8e809b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1753,7 +1753,7 @@ if test "x$enable_gallium_llvm" = xyes; then
 
     if test "x$LLVM_CONFIG" != xno; then
 	LLVM_VERSION=`$LLVM_CONFIG --version`
-	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed 's/-DNDEBUG\>//g'`
+	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g'`
 	LLVM_LIBS="`$LLVM_CONFIG --libs`"
 
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`



More information about the mesa-commit mailing list