Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

compilers/objcpp: Use shared C++ standards with ClangCPPStandard

This commit is contained in:
Dylan Baker 2024-09-06 09:35:11 -07:00
parent a935eeef50
commit b5ff5931b6
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mesonbuild/compilers/cpp.py
View File

@ -45,9 +45,9 @@ if T.TYPE_CHECKING:
else: else:
CompilerMixinBase = object CompilerMixinBase = object
_ALL_STDS = ['c++98', 'c++0x', 'c++03', 'c++1y', 'c++1z', 'c++11', 'c++14', 'c++17', 'c++2a', 'c++20', 'c++23', 'c++26'] ALL_STDS = ['c++98', 'c++0x', 'c++03', 'c++1y', 'c++1z', 'c++11', 'c++14', 'c++17', 'c++2a', 'c++20', 'c++23', 'c++26']
_ALL_STDS += [f'gnu{std[1:]}' for std in _ALL_STDS] ALL_STDS += [f'gnu{std[1:]}' for std in ALL_STDS]
_ALL_STDS += ['vc++11', 'vc++14', 'vc++17', 'vc++20', 'vc++latest', 'c++latest'] ALL_STDS += ['vc++11', 'vc++14', 'vc++17', 'vc++20', 'vc++latest', 'c++latest']
def non_msvc_eh_options(eh: str, args: T.List[str]) -> None: def non_msvc_eh_options(eh: str, args: T.List[str]) -> None:
@ -175,7 +175,7 @@ class CPPCompiler(CLikeCompiler, Compiler):
opts = super().get_options() opts = super().get_options()
key = self.form_compileropt_key('std') key = self.form_compileropt_key('std')
opts.update({ opts.update({
key: options.UserStdOption('C++', _ALL_STDS), key: options.UserStdOption('C++', ALL_STDS),
}) })
return opts return opts

38
mesonbuild/compilers/objcpp.py
View File

@ -5,13 +5,13 @@ from __future__ import annotations
import typing as T import typing as T
from .. import options from ..options import OptionKey, UserStdOption
from ..options import OptionKey
from .mixins.clike import CLikeCompiler from .cpp import ALL_STDS
from .compilers import Compiler from .compilers import Compiler
from .mixins.gnu import GnuCompiler, gnu_common_warning_args, gnu_objc_warning_args from .mixins.gnu import GnuCompiler, gnu_common_warning_args, gnu_objc_warning_args
from .mixins.clang import ClangCompiler from .mixins.clang import ClangCompiler, ClangCPPStds
from .mixins.clike import CLikeCompiler
if T.TYPE_CHECKING: if T.TYPE_CHECKING:
from .. import coredata from .. import coredata
@ -20,6 +20,7 @@ if T.TYPE_CHECKING:
from ..linkers.linkers import DynamicLinker from ..linkers.linkers import DynamicLinker
from ..mesonlib import MachineChoice from ..mesonlib import MachineChoice
class ObjCPPCompiler(CLikeCompiler, Compiler): class ObjCPPCompiler(CLikeCompiler, Compiler):
language = 'objcpp' language = 'objcpp'
@ -41,6 +42,19 @@ class ObjCPPCompiler(CLikeCompiler, Compiler):
code = '#import<stdio.h>\nclass MyClass;int main(void) { return 0; }\n' code = '#import<stdio.h>\nclass MyClass;int main(void) { return 0; }\n'
return self._sanity_check_impl(work_dir, environment, 'sanitycheckobjcpp.mm', code) 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')
opts.update({
key: UserStdOption('cpp', ALL_STDS),
})
return opts
class GnuObjCPPCompiler(GnuCompiler, ObjCPPCompiler): class GnuObjCPPCompiler(GnuCompiler, ObjCPPCompiler):
def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
@ -61,7 +75,7 @@ class GnuObjCPPCompiler(GnuCompiler, ObjCPPCompiler):
self.supported_warn_args(gnu_objc_warning_args))} self.supported_warn_args(gnu_objc_warning_args))}
class ClangObjCPPCompiler(ClangCompiler, ObjCPPCompiler): class ClangObjCPPCompiler(ClangCPPStds, ClangCompiler, ObjCPPCompiler):
def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
is_cross: bool, info: 'MachineInfo', is_cross: bool, info: 'MachineInfo',
@ -78,21 +92,9 @@ class ClangObjCPPCompiler(ClangCompiler, ObjCPPCompiler):
'3': default_warn_args + ['-Wextra', '-Wpedantic'], '3': default_warn_args + ['-Wextra', '-Wpedantic'],
'everything': ['-Weverything']} 'everything': ['-Weverything']}
def get_options(self) -> coredata.MutableKeyedOptionDictType:
return self.update_options(
super().get_options(),
self.create_option(options.UserComboOption,
OptionKey('cpp_std', machine=self.for_machine),
'C++ language standard to use',
['none', 'c++98', 'c++11', 'c++14', 'c++17', 'c++20', 'c++2b',
'gnu++98', 'gnu++11', 'gnu++14', 'gnu++17', 'gnu++20',
'gnu++2b'],
'none'),
)
def get_option_compile_args(self, options: 'coredata.KeyedOptionDictType') -> T.List[str]: def get_option_compile_args(self, options: 'coredata.KeyedOptionDictType') -> T.List[str]:
args = [] args = []
std = options.get_value(OptionKey('cpp_std', machine=self.for_machine)) std = options.get_value(self.form_compileropt_key('std'))
if std != 'none': if std != 'none':
args.append('-std=' + std) args.append('-std=' + std)
return args return args