diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index d0326d795016..615548e0920e 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -352,6 +352,13 @@ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_ CCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross, info, linker=linker, full_version=full_version) PGICompiler.__init__(self) + def get_options(self) -> 'MutableKeyedOptionDictType': + opts = CCompiler.get_options(self) + stds = ['c89', 'c90', 'c99', 'c11', 'c17', 'c18'] + std_opt = opts[OptionKey('std', machine=self.for_machine, lang=self.language)] + assert isinstance(std_opt, options.UserStdOption), 'for mypy' + std_opt.set_versions(stds,gnu=True) + return opts class ElbrusCCompiler(ElbrusCompiler, CCompiler): diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index ea5182370fe3..c1e84d4fde0e 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -549,6 +549,17 @@ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_ info, linker=linker, full_version=full_version) PGICompiler.__init__(self) + def get_options(self) -> 'MutableKeyedOptionDictType': + cppstd_choices = [ + 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++20', 'c++23', + 'gnu++98', 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++20' + ] + opts = CPPCompiler.get_options(self) + std_opt = opts[OptionKey('std', machine=self.for_machine, lang=self.language)] + assert isinstance(std_opt, options.UserStdOption), 'for mypy' + std_opt.set_versions(cppstd_choices) + return opts + class ElbrusCPPCompiler(ElbrusCompiler, CPPCompiler): def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,