Mesa (master): clover: Fix building with latest llvm

Francisco Jerez currojerez at kemper.freedesktop.org
Mon Mar 3 16:23:04 UTC 2014


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

Author: Bruno Jiménez <brunojimen at gmail.com>
Date:   Sun Mar  2 22:39:02 2014 +0100

clover: Fix building with latest llvm

Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

---

 src/gallium/state_trackers/clover/Makefile.am |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
index ece2b38..75eae86 100644
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ b/src/gallium/state_trackers/clover/Makefile.am
@@ -37,9 +37,8 @@ libcltgsi_la_SOURCES = \
 	tgsi/compiler.cpp
 
 libclllvm_la_CXXFLAGS = \
-	-std=c++98 \
 	$(VISIBILITY_CXXFLAGS) \
-	$(LLVM_CPPFLAGS) \
+	$(LLVM_CXXFLAGS) \
 	$(DEFINES) \
 	-DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \
 	-DLIBCLC_LIBEXECDIR=\"$(LIBCLC_LIBEXECDIR)/\" \
@@ -49,7 +48,7 @@ libclllvm_la_SOURCES = \
 	llvm/invocation.cpp
 
 libclover_la_CXXFLAGS = \
-	-std=c++0x \
+	-std=c++11 \
 	$(VISIBILITY_CXXFLAGS)
 
 libclover_la_LIBADD = \




More information about the mesa-commit mailing list