[Mesa-dev] [PATCH v2] mesa/st/tests: Correct build flags and force -std=c++11

[Gert Wollny]

Include src/gallium/Automake.inc, correct the build flags
accordingly, and force -std=c++11 because only when building
against llvm and only with llvm >= 3.9 LLVM_CXXFLAGS
actually provides -std=c++11.

Fixes: 7be6d8fe12  ("mesa/st: glsl_to_tgsi: add tests for the
new temporary lifetime tracker")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102665

Reviewed-by: Emil Velikov <emil.velikov at collabora.com> (v1)
---
 src/mesa/state_tracker/tests/Makefile.am | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/mesa/state_tracker/tests/Makefile.am b/src/mesa/state_tracker/tests/Makefile.am
index cd610e0adf..f32957608e 100644
--- a/src/mesa/state_tracker/tests/Makefile.am
+++ b/src/mesa/state_tracker/tests/Makefile.am
@@ -1,18 +1,17 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
 AM_CFLAGS = \
 	$(PTHREAD_CFLAGS)
 
 AM_CXXFLAGS = \
-	$(LLVM_CXXFLAGS)
+	$(GALLIUM_DRIVER_CXXFLAGS) \
+	-std=c++11
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/gtest/include \
-	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_builddir)/src/mesa \
 	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_builddir)/src/compiler/glsl \
 	$(DEFINES)
 
@@ -32,7 +31,4 @@ st_renumerate_test_LDADD = \
 	$(top_builddir)/src/util/libmesautil.la \
 	$(top_builddir)/src/gtest/libgtest.la \
 	$(GALLIUM_COMMON_LIB_DEPS) \
-	$(LIBUNWIND_LIBS) \
-	$(LLVM_LIBS) \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS)
+	$(LLVM_LIBS)
-- 
2.13.5