2018-02-06 10:16:50 +01:00
|
|
|
Index: meson-0.44.0/mesonbuild/compilers/cpp.py
|
|
|
|
|
===================================================================
|
|
|
|
|
--- meson-0.44.0.orig/mesonbuild/compilers/cpp.py
|
|
|
|
|
+++ meson-0.44.0/mesonbuild/compilers/cpp.py
|
|
|
|
|
@@ -75,9 +75,13 @@ class ClangCPPCompiler(ClangCompiler, CP
|
2017-03-17 14:58:10 +01:00
|
|
|
'3': default_warn_args + ['-Wextra', '-Wpedantic']}
|
|
|
|
|
|
|
|
|
|
def get_options(self):
|
2018-02-06 10:16:50 +01:00
|
|
|
+ c_stds = ['c++98', 'c++03', 'c++11']
|
2017-08-15 18:57:45 +02:00
|
|
|
+ g_stds = ['gnu++11']
|
2017-09-08 14:27:05 +02:00
|
|
|
+ if version_compare(self.version, '>=5.0.0'):
|
2018-02-06 10:16:50 +01:00
|
|
|
+ c_stds += ['c++14', 'c++17', 'c++1z']
|
|
|
|
|
+ g_stds += ['gnu++14', 'gnu++17', 'gnu++1z']
|
2017-08-15 18:57:45 +02:00
|
|
|
return {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
|
2018-02-06 10:16:50 +01:00
|
|
|
- ['none', 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z',
|
|
|
|
|
- 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++1z'],
|
2017-03-17 14:58:10 +01:00
|
|
|
+ ['none'] + c_stds + g_stds,
|
2017-08-15 18:57:45 +02:00
|
|
|
'none')}
|
|
|
|
|
|
|
|
|
|
def get_option_compile_args(self, options):
|
