diff options
| author | Kai Wasserbäch <kai@dev.carbon-project.org> | 2019-08-17 10:59:43 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2019-08-20 05:39:19 +0000 |
| commit | 1abe87383e1529a14498d70a0cf445728b9c338d (patch) | |
| tree | faa347aadfdd04dbbf513d77dc66412453d8d8fc | |
| parent | d0ec5d38f6cff2e61d9e526423c0a016cc830d14 (diff) | |
| download | mesa-1abe87383e1529a14498d70a0cf445728b9c338d.tar.gz | |
build: Bump C++ standard requirement to C++14 to fix FTBFS with LLVM 10
When building Mesa against a recent LLVM 10 with C++11, the build fails
if the AMD common code is built as well due to "std::index_sequence"
being undeclared.
LLVM requires a minimum of C++14.
Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Acked-by: Eric Engestrom <eric@engestrom.ch>
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | scons/llvm.py | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/SConscript | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build index ea9dca71afc..bf61511d292 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,7 @@ project( ).stdout(), license : 'MIT', meson_version : '>= 0.46', - default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11'] + default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++14'] ) cc = meson.get_compiler('c') diff --git a/scons/llvm.py b/scons/llvm.py index c6d16a2bbf0..0c15b279aba 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -269,7 +269,7 @@ def generate(env): env.ParseConfig('%s --ldflags' % llvm_config) if llvm_version >= distutils.version.LooseVersion('3.5'): env.ParseConfig('%s --system-libs' % llvm_config) - env.Append(CXXFLAGS = ['-std=c++11']) + env.Append(CXXFLAGS = ['-std=c++14']) except OSError: print('scons: llvm-config version %s failed' % llvm_version) return diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index fe976501451..a2d5fa60da4 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -48,7 +48,7 @@ LOCAL_SRC_FILES += \ $(call mesa-build-with-llvm) endif -LOCAL_CPPFLAGS += -std=c++11 +LOCAL_CPPFLAGS += -std=c++14 # We need libmesa_nir to get NIR's generated include directories. LOCAL_MODULE := libmesa_gallium diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript index 2236b1aa5de..61432a0c342 100644 --- a/src/gallium/drivers/swr/SConscript +++ b/src/gallium/drivers/swr/SConscript @@ -32,7 +32,7 @@ else: if not env['msvc'] : env.Append(CCFLAGS = [ - '-std=c++11', + '-std=c++14', ]) swrroot = '#src/gallium/drivers/swr/' |