From: Kai Wasserbäch <kai@dev.carbon-project.org>
Date: Sat, 17 Aug 2019 08:59:43 +0000 (+0200)
Subject: build: Bump C++ standard requirement to C++14 to fix FTBFS with LLVM 10
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1abe87383e1529a14498d70a0cf445728b9c338d;p=mesa.git

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>
---

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/'