diff options
Diffstat (limited to 'mesonbuild/compilers/objcpp.py')
| -rw-r--r-- | mesonbuild/compilers/objcpp.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py index de968be42..104d0cb82 100644 --- a/mesonbuild/compilers/objcpp.py +++ b/mesonbuild/compilers/objcpp.py @@ -35,6 +35,16 @@ class ObjCPPCompiler(CLikeCompiler, Compiler): linker=linker) CLikeCompiler.__init__(self) + def form_compileropt_key(self, basename: str) -> OptionKey: + if basename == 'std': + return OptionKey('cpp_std', machine=self.for_machine) + return super().form_compileropt_key(basename) + + def make_option_name(self, key: OptionKey) -> str: + if key.name == 'std': + return 'cpp_std' + return super().make_option_name(key) + @staticmethod def get_display_language() -> str: return 'Objective-C++' @@ -43,11 +53,6 @@ class ObjCPPCompiler(CLikeCompiler, Compiler): code = '#import<stdio.h>\nclass MyClass;int main(void) { return 0; }\n' return self._sanity_check_impl(work_dir, environment, 'sanitycheckobjcpp.mm', code) - def form_compileropt_key(self, basename: str) -> OptionKey: - if basename == 'std': - return OptionKey(f'cpp_{basename}', machine=self.for_machine) - return super().form_compileropt_key(basename) - def get_options(self) -> coredata.MutableKeyedOptionDictType: opts = super().get_options() key = self.form_compileropt_key('std') |