diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/clover/Makefile.am | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 3dd9b9a4ce6..d362dfb15bd 100644 --- 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 321393536dc..7167bc1c5cf 100644 --- 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) |