diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-12-28 18:31:11 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-12-28 18:31:11 +0200 |
| commit | 5e12c03db6c0bf7b266fc351dc24e13d4e6f737e (patch) | |
| tree | d4f6459b745553c1faf978af8bd3776e3a9604a3 | |
| parent | 7cad8a1bfb4cca03acafd30c07ff4c2cf47e65cb (diff) | |
| parent | 9cb3ed4014be79a2d514cce30d219649c0adca54 (diff) | |
| download | meson-5e12c03db6c0bf7b266fc351dc24e13d4e6f737e.tar.gz | |
Merge pull request #339 from martin-ejdestig/cpp_std_trivial_fixes
cpp_std trivial fixes
| -rw-r--r-- | authors.txt | 3 | ||||
| -rw-r--r-- | compilers.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/authors.txt b/authors.txt index c3720b542..ccb8e838c 100644 --- a/authors.txt +++ b/authors.txt @@ -24,4 +24,5 @@ German Diago Gomez Kyle Manna Haakon Sporsheim Wink Saville -Yoav Alon
\ No newline at end of file +Yoav Alon +Martin Ejdestig diff --git a/compilers.py b/compilers.py index eea79d070..06dd1d049 100644 --- a/compilers.py +++ b/compilers.py @@ -1422,8 +1422,8 @@ class GnuCPPCompiler(CPPCompiler): return get_gcc_soname_args(self.gcc_type, shlib_name, path, soversion) def get_options(self): - opts = {'cpp_std' : coredata.UserComboOption('cpp_std', 'C language standard to use', - ['none', 'c++03', 'c++11', 'c++1y'], + opts = {'cpp_std' : coredata.UserComboOption('cpp_std', 'C++ language standard to use', + ['none', 'c++03', 'c++11', 'c++14'], 'c++11')} if self.gcc_type == GCC_MINGW: opts.update({ @@ -1469,7 +1469,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++1y'], + ['none', 'c++03', 'c++11', 'c++14'], 'c++11')} def get_option_compile_args(self, options): |