diff options
| author | Tim Rowley <timothy.o.rowley@intel.com> | 2017-03-29 14:25:12 -0500 |
|---|---|---|
| committer | Tim Rowley <timothy.o.rowley@intel.com> | 2017-04-05 18:19:16 -0500 |
| commit | 3c52a7316a1b968a780f387b70a17183d5bc9054 (patch) | |
| tree | 3e45112c13810e662dc90d122840cc21241d5d21 | |
| parent | e5fdfcf83666bace5330907ac39ad88817d154cb (diff) | |
swr: [configure.ac/scons] require c++14
New C++ features used by upcoming swr changes.
Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/SConscript | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 74a28ac1d9..7d92b33a0f 100644 --- a/configure.ac +++ b/configure.ac @@ -2396,10 +2396,10 @@ 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]) + swr_require_cxx_feature_flags "C++14" "__cplusplus >= 201402L" \ + "-std=c++14" \ + SWR_CXX14_CXXFLAGS + AC_SUBST([SWR_CXX14_CXXFLAGS]) swr_require_cxx_feature_flags "AVX" "defined(__AVX__)" \ ",-mavx,-march=core-avx" \ diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index 5309311080..c41662fbf2 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) $(SWR_CXX14_CXXFLAGS) noinst_LTLIBRARIES = libmesaswr.la @@ -32,7 +32,7 @@ COMMON_CXXFLAGS = \ -fno-strict-aliasing \ $(GALLIUM_DRIVER_CFLAGS) \ $(LLVM_CXXFLAGS) \ - $(SWR_CXX11_CXXFLAGS) \ + $(SWR_CXX14_CXXFLAGS) \ -I$(builddir)/rasterizer/codegen \ -I$(builddir)/rasterizer/jitter \ -I$(builddir)/rasterizer/archrast \ diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript index 18d6c9b67d..eca5dba830 100644 --- a/src/gallium/drivers/swr/SConscript +++ b/src/gallium/drivers/swr/SConscript @@ -43,7 +43,7 @@ loadersource = env.ParseSourceList('Makefile.sources', [ if not env['msvc'] : env.Append(CCFLAGS = [ - '-std=c++11', + '-std=c++14', ]) swrroot = '#src/gallium/drivers/swr/' |