diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-04-20 14:18:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-20 14:18:27 +0300 |
| commit | 5c85b5028080e74b3a74f9e0d63166c3c3ca15e6 (patch) | |
| tree | dbf4c168c34a1b67fc2f107ebc6aba593a4c66e4 /mesonbuild/compilers/cpp.py | |
| parent | bf65660509bcea67b3a25477c89807a673248b08 (diff) | |
| parent | 0ec71fff34b3a120b4a688e4dd79a64dd2b0f6a1 (diff) | |
| download | meson-5c85b5028080e74b3a74f9e0d63166c3c3ca15e6.zip meson-5c85b5028080e74b3a74f9e0d63166c3c3ca15e6.tar.gz meson-5c85b5028080e74b3a74f9e0d63166c3c3ca15e6.tar.bz2 | |
Merge pull request #5284 from makise-homura/update_lcc_support
Update lcc support
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 67de684..87e6ffc 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -115,8 +115,8 @@ class CPPCompiler(CCompiler): 'gnu++17': 'gnu++1z' } - # Currently, remapping is only supported for Clang and GCC - assert(self.id in frozenset(['clang', 'gcc'])) + # Currently, remapping is only supported for Clang, Elbrus and GCC + assert(self.id in frozenset(['clang', 'lcc', 'gcc'])) if cpp_std not in CPP_FALLBACKS: # 'c++03' and 'c++98' don't have fallback types @@ -251,10 +251,13 @@ class ElbrusCPPCompiler(GnuCPPCompiler, ElbrusCompiler): # It does not support c++/gnu++ 17 and 1z, but still does support 0x, 1y, and gnu++98. def get_options(self): opts = CPPCompiler.get_options(self) - opts['cpp_std'] = coredata.UserComboOption('cpp_std', 'C++ language standard to use', - ['none', 'c++98', 'c++03', 'c++0x', 'c++11', 'c++14', 'c++1y', - 'gnu++98', 'gnu++03', 'gnu++0x', 'gnu++11', 'gnu++14', 'gnu++1y'], - 'none') + opts.update({'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use', + ['none', 'c++98', 'c++03', 'c++0x', 'c++11', 'c++14', 'c++1y', + 'gnu++98', 'gnu++03', 'gnu++0x', 'gnu++11', 'gnu++14', 'gnu++1y'], + 'none'), + 'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl', + 'STL debug mode', + False)}) return opts # Elbrus C++ compiler does not have lchmod, but there is only linker warning, not compiler error. |