diff options
author | Kai Wasserbäch <[email protected]> | 2019-08-17 10:59:43 +0200 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2019-08-20 05:39:19 +0000 |
commit | 1abe87383e1529a14498d70a0cf445728b9c338d (patch) | |
tree | faa347aadfdd04dbbf513d77dc66412453d8d8fc /src | |
parent | d0ec5d38f6cff2e61d9e526423c0a016cc830d14 (diff) |
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 <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/auxiliary/Android.mk | 2 | ||||
-rw-r--r-- | src/gallium/drivers/swr/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
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/' |