diff options
| -rw-r--r-- | compilers.py | 8 | ||||
| -rw-r--r-- | test cases/common/102 threads/meson.build | 3 | ||||
| -rw-r--r-- | test cases/frameworks/1 boost/meson.build | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/compilers.py b/compilers.py index 73fd8cd..be22d22 100644 --- a/compilers.py +++ b/compilers.py @@ -1280,7 +1280,7 @@ class GnuCCompiler(CCompiler): def get_options(self): opts = {'c_std' : coredata.UserComboOption('c_std', 'C language standard to use', ['none', 'c89', 'c99', 'c11', 'gnu89', 'gnu99', 'gnu11'], - 'c11')} + 'none')} if self.gcc_type == GCC_MINGW: opts.update({ 'c_winlibs': coredata.UserStringArrayOption('c_winlibs', 'Standard Win libraries to link against', @@ -1389,7 +1389,7 @@ class ClangCCompiler(CCompiler): def get_options(self): return {'c_std' : coredata.UserComboOption('c_std', 'C language standard to use', ['none', 'c89', 'c99', 'c11'], - 'c11')} + 'none')} def get_option_compile_args(self, options): args = [] @@ -1431,7 +1431,7 @@ class GnuCPPCompiler(CPPCompiler): def get_options(self): opts = {'cpp_std' : coredata.UserComboOption('cpp_std', 'C++ language standard to use', ['none', 'c++03', 'c++11', 'c++14'], - 'c++11')} + 'none')} if self.gcc_type == GCC_MINGW: opts.update({ 'cpp_winlibs': coredata.UserStringArrayOption('c_winlibs', 'Standard Win libraries to link against', @@ -1477,7 +1477,7 @@ class ClangCPPCompiler(CPPCompiler): def get_options(self): return {'cpp_std' : coredata.UserComboOption('cpp_std', 'C++ language standard to use', ['none', 'c++03', 'c++11', 'c++14'], - 'c++11')} + 'none')} def get_option_compile_args(self, options): args = [] diff --git a/test cases/common/102 threads/meson.build b/test cases/common/102 threads/meson.build index 78e5fbe..1fbb15a 100644 --- a/test cases/common/102 threads/meson.build +++ b/test cases/common/102 threads/meson.build @@ -1,4 +1,5 @@ -project('threads', 'cpp', 'c') +project('threads', 'cpp', 'c', + default_options : ['cpp_std=c++11']) threaddep = dependency('threads') diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build index 454c161..6f9b16f 100644 --- a/test cases/frameworks/1 boost/meson.build +++ b/test cases/frameworks/1 boost/meson.build @@ -1,4 +1,5 @@ -project('boosttest', 'cpp') +project('boosttest', 'cpp', + default_options : ['cpp_std=c++11']) # We want to have multiple separate configurations of Boost # within one project. The need to be independent of each other. |