summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/cpp.py
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
-rw-r--r--mesonbuild/compilers/cpp.py81
1 files changed, 39 insertions, 42 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index d9facb721..f53004f61 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -66,13 +66,12 @@ class CPPCompiler(CLikeCompiler, Compiler):
language = 'cpp'
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
# If a child ObjCPP class has already set it, don't set it ourselves
Compiler.__init__(self, ccache, exelist, version, for_machine, env,
- is_cross=is_cross, linker=linker,
- full_version=full_version)
+ linker=linker, full_version=full_version)
CLikeCompiler.__init__(self)
@classmethod
@@ -219,11 +218,11 @@ class _StdCPPLibMixin(CompilerMixinBase):
class ClangCPPCompiler(_StdCPPLibMixin, ClangCPPStds, ClangCompiler, CPPCompiler):
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
defines: T.Optional[T.Dict[str, str]] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
ClangCompiler.__init__(self, defines)
default_warn_args = ['-Wall', '-Winvalid-pch']
@@ -353,17 +352,16 @@ class EmscriptenCPPCompiler(EmscriptenMixin, ClangCPPCompiler):
_CPP23_VERSION = '>=2.0.10'
_CPP26_VERSION = '>=3.1.39'
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
defines: T.Optional[T.Dict[str, str]] = None,
full_version: T.Optional[str] = None):
- if not is_cross:
+ if not env.is_cross_build(for_machine):
raise MesonException('Emscripten compiler can only be used for cross compilation.')
if not version_compare(version, '>=1.39.19'):
raise MesonException('Meson requires Emscripten >= 1.39.19')
- ClangCPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
- env, linker=linker,
- defines=defines, full_version=full_version)
+ ClangCPPCompiler.__init__(self, ccache, exelist, version, for_machine, env,
+ linker=linker, defines=defines, full_version=full_version)
def get_option_std_args(self, target: BuildTarget, env: Environment, subproject: T.Optional[str] = None) -> T.List[str]:
args: T.List[str] = []
@@ -379,10 +377,10 @@ class ArmclangCPPCompiler(ArmclangCompiler, CPPCompiler):
Keil armclang
'''
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
ArmclangCompiler.__init__(self)
default_warn_args = ['-Wall', '-Winvalid-pch']
@@ -426,11 +424,11 @@ class ArmclangCPPCompiler(ArmclangCompiler, CPPCompiler):
class GnuCPPCompiler(_StdCPPLibMixin, GnuCPPStds, GnuCompiler, CPPCompiler):
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
defines: T.Optional[T.Dict[str, str]] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
GnuCompiler.__init__(self, defines)
default_warn_args = ['-Wall', '-Winvalid-pch']
@@ -541,10 +539,10 @@ class GnuCPPCompiler(_StdCPPLibMixin, GnuCPPStds, GnuCompiler, CPPCompiler):
class PGICPPCompiler(PGICompiler, CPPCompiler):
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
PGICompiler.__init__(self)
@@ -553,10 +551,10 @@ class NvidiaHPC_CPPCompiler(PGICompiler, CPPCompiler):
id = 'nvidia_hpc'
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
PGICompiler.__init__(self)
@@ -573,11 +571,11 @@ class NvidiaHPC_CPPCompiler(PGICompiler, CPPCompiler):
class ElbrusCPPCompiler(ElbrusCompiler, CPPCompiler):
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
defines: T.Optional[T.Dict[str, str]] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
ElbrusCompiler.__init__(self)
@@ -655,10 +653,10 @@ class ElbrusCPPCompiler(ElbrusCompiler, CPPCompiler):
class IntelCPPCompiler(IntelGnuLikeCompiler, CPPCompiler):
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
IntelGnuLikeCompiler.__init__(self)
self.lang_header = 'c++-header'
@@ -874,10 +872,10 @@ class VisualStudioCPPCompiler(CPP11AsCPP14Mixin, VisualStudioLikeCPPCompilerMixi
id = 'msvc'
def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
- is_cross: bool, env: Environment, target: str,
+ env: Environment, target: str,
linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
MSVCCompiler.__init__(self, target)
@@ -919,10 +917,10 @@ class ClangClCPPCompiler(CPP11AsCPP14Mixin, VisualStudioLikeCPPCompilerMixin, Cl
id = 'clang-cl'
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice,
- is_cross: bool, env: Environment, target: str,
+ env: Environment, target: str,
linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, [], exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, [], exelist, version, for_machine,
env, linker=linker, full_version=full_version)
ClangClCompiler.__init__(self, target)
@@ -934,10 +932,10 @@ class ClangClCPPCompiler(CPP11AsCPP14Mixin, VisualStudioLikeCPPCompilerMixin, Cl
class IntelClCPPCompiler(VisualStudioLikeCPPCompilerMixin, IntelVisualStudioLikeCompiler, CPPCompiler):
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice,
- is_cross: bool, env: Environment, target: str,
+ env: Environment, target: str,
linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, [], exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, [], exelist, version, for_machine,
env, linker=linker, full_version=full_version)
IntelVisualStudioLikeCompiler.__init__(self, target)
@@ -962,10 +960,10 @@ class IntelLLVMClCPPCompiler(IntelClCPPCompiler):
class ArmCPPCompiler(ArmCompiler, CPPCompiler):
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
ArmCompiler.__init__(self)
@@ -994,10 +992,10 @@ class ArmCPPCompiler(ArmCompiler, CPPCompiler):
class CcrxCPPCompiler(CcrxCompiler, CPPCompiler):
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
CcrxCompiler.__init__(self)
@@ -1018,10 +1016,10 @@ class CcrxCPPCompiler(CcrxCompiler, CPPCompiler):
return []
class TICPPCompiler(TICompiler, CPPCompiler):
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
TICompiler.__init__(self)
@@ -1058,9 +1056,9 @@ class MetrowerksCPPCompilerARM(MetrowerksCompiler, CPPCompiler):
id = 'mwccarm'
def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
- is_cross: bool, env: Environment, linker: T.Optional['DynamicLinker'] = None,
+ env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
MetrowerksCompiler.__init__(self)
@@ -1085,10 +1083,9 @@ class MetrowerksCPPCompilerEmbeddedPowerPC(MetrowerksCompiler, CPPCompiler):
id = 'mwcceppc'
def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
- is_cross: bool, env: Environment,
- linker: T.Optional['DynamicLinker'] = None,
+ env: Environment, linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None):
- CPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
+ CPPCompiler.__init__(self, ccache, exelist, version, for_machine,
env, linker=linker, full_version=full_version)
MetrowerksCompiler.__init__(self)
@@ -1113,10 +1110,10 @@ class Xc32CPPCompiler(Xc32CPPStds, Xc32Compiler, GnuCPPCompiler):
"""Microchip XC32 C++ compiler."""
- def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool,
+ def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
env: Environment, linker: T.Optional[DynamicLinker] = None,
defines: T.Optional[T.Dict[str, str]] = None,
full_version: T.Optional[str] = None):
- GnuCPPCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
- env, linker=linker, full_version=full_version, defines=defines)
+ GnuCPPCompiler.__init__(self, ccache, exelist, version, for_machine, env,
+ linker=linker, full_version=full_version, defines=defines)
Xc32Compiler.__init__(self)
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-04 06:16:33 +0000