clover: use the unified check for c++11 instead of the gcc version number

So far clover based its test for compiler support on the version of gcc,
while in reality support for c++11 is required. This patch replaces the
version check by the check unified for all modules that require c++11.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/configure.ac b/configure.ac
index 3dd9b9a4ce688925a9834a907818c59c53d97fd3..d362dfb15bd5370305f2dd77bfa421fcf5bf5c7b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2294,8 +2294,8 @@ if test "x$enable_opencl" = xyes; then
         AC_MSG_ERROR([cannot enable OpenCL without Gallium])
     fi
 
-    if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
-        AC_MSG_ERROR([gcc >= 4.7 is required to build clover])
+    if test "x$HAVE_CXX11" != "xyes"; then
+       AC_MSG_ERROR([clover requires c++11 support])
     fi
 
     if test "x$have_libclc" = xno; then

diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
index 321393536dc6939019dcd13ac3d723c110f5112e..7167bc1c5cf12d0656e3d920532ed0767b9341e1 100644 (file)
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ b/src/gallium/state_trackers/clover/Makefile.am
@@ -31,14 +31,14 @@ endif
 noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
 
 libcltgsi_la_CXXFLAGS = \
-       -std=c++11 \
+       $(CXX11_CXXFLAGS) \
        $(CLOVER_STD_OVERRIDE) \
        $(VISIBILITY_CXXFLAGS)
 
 libcltgsi_la_SOURCES = $(TGSI_SOURCES)
 
 libclllvm_la_CXXFLAGS = \
-       -std=c++11 \
+       $(CXX11_CXXFLAGS) \
        $(VISIBILITY_CXXFLAGS) \
        $(LLVM_CXXFLAGS) \
        $(CLOVER_STD_OVERRIDE) \
@@ -51,7 +51,7 @@ libclllvm_la_CXXFLAGS = \
 libclllvm_la_SOURCES = $(LLVM_SOURCES)
 
 libclover_la_CXXFLAGS = \
-       -std=c++11 \
+       $(CXX11_CXXFLAGS) \
        $(CLOVER_STD_OVERRIDE) \
        $(VISIBILITY_CXXFLAGS)