mesa/st/tests: Correct build flags and force -std=c++11

Include src/gallium/Automake.inc, correct the build flags accordingly.

Force -std=c++11 (extensively used by the test) as otherwise it gets
defined only when building against llvm >= 3.9.

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@collabora.com> (v1)
This commit is contained in:
Gert Wollny
2017-09-13 15:03:34 +02:00
committed by Emil Velikov
parent 3c5fb7346f
commit c75d781610
+5 -9
View File
@@ -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)