diff options
| author | Gert Wollny <[email protected]> | 2017-10-18 17:05:26 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-11-08 16:03:38 +0000 |
| commit | 8f18528ceade31168be76edbb9fb2c09760fad21 (patch) | |
| tree | 28593803c8d64c741626413ba7c0449a8d511848 | |
| parent | 09ad2576ece2f813e5be9dda60fdb0b9598d0d23 (diff) | |
swr: Replace the check for c++11 by the unified version
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/Makefile.am | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 14236c9dc99..3dd9b9a4ce6 100644 --- a/configure.ac +++ b/configure.ac @@ -2582,10 +2582,9 @@ if test -n "$with_gallium_drivers"; then xswr) llvm_require_version $LLVM_REQUIRED_SWR "swr" - swr_require_cxx_feature_flags "C++11" "__cplusplus >= 201103L" \ - ",-std=c++11" \ - SWR_CXX11_CXXFLAGS - AC_SUBST([SWR_CXX11_CXXFLAGS]) + if test "x$HAVE_CXX11" != "xyes"; then + AC_MSG_ERROR([swr requires c++11 support]) + fi swr_require_cxx_feature_flags "AVX" "defined(__AVX__)" \ ",-target-cpu=sandybridge,-mavx,-march=core-avx,-tp=sandybridge" \ diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index b20f128bd2b..c995f1b84a1 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -22,7 +22,7 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc -AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(SWR_CXX11_CXXFLAGS) +AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(CXX11_CXXFLAGS) noinst_LTLIBRARIES = libmesaswr.la @@ -39,7 +39,7 @@ COMMON_CXXFLAGS = \ -fno-strict-aliasing \ $(GALLIUM_DRIVER_CFLAGS) \ $(LLVM_CXXFLAGS) \ - $(SWR_CXX11_CXXFLAGS) \ + $(CXX11_CXXFLAGS) \ -I$(builddir)/rasterizer/codegen \ -I$(builddir)/rasterizer/core \ -I$(builddir)/rasterizer/jitter \ |