From fc93ef0370dc2e4cb44fe4abf5729be3e3e3a6c3 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 31 Oct 2025 10:42:07 -0700 Subject: compilers: Stop passing `is_cross` This is calculated by `Environment().is_cross_build(for_machine)`. Since we have that in the Compiler class, just calculate it in the Compiler initializer --- mesonbuild/compilers/objc.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mesonbuild/compilers/objc.py') diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py index 8cbe2933d..58d676786 100644 --- a/mesonbuild/compilers/objc.py +++ b/mesonbuild/compilers/objc.py @@ -27,11 +27,11 @@ class ObjCCompiler(CLikeCompiler, Compiler): language = 'objc' def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, - is_cross: bool, env: Environment, + env: Environment, linker: T.Optional['DynamicLinker'] = None, full_version: T.Optional[str] = None): Compiler.__init__(self, ccache, exelist, version, for_machine, env, - is_cross=is_cross, full_version=full_version, + full_version=full_version, linker=linker) CLikeCompiler.__init__(self) @@ -59,11 +59,11 @@ class ObjCCompiler(CLikeCompiler, Compiler): class GnuObjCCompiler(GnuCStds, GnuCompiler, ObjCCompiler): def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, - is_cross: bool, env: Environment, + env: Environment, defines: T.Optional[T.Dict[str, str]] = None, linker: T.Optional['DynamicLinker'] = None, full_version: T.Optional[str] = None): - ObjCCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross, + ObjCCompiler.__init__(self, ccache, exelist, version, for_machine, env, linker=linker, full_version=full_version) GnuCompiler.__init__(self, defines) default_warn_args = ['-Wall', '-Winvalid-pch'] @@ -89,11 +89,11 @@ class GnuObjCCompiler(GnuCStds, GnuCompiler, ObjCCompiler): class ClangObjCCompiler(ClangCStds, ClangCompiler, ObjCCompiler): def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice, - is_cross: bool, env: Environment, + env: Environment, defines: T.Optional[T.Dict[str, str]] = None, linker: T.Optional['DynamicLinker'] = None, full_version: T.Optional[str] = None): - ObjCCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross, + ObjCCompiler.__init__(self, ccache, exelist, version, for_machine, env, linker=linker, full_version=full_version) ClangCompiler.__init__(self, defines) default_warn_args = ['-Wall', '-Winvalid-pch'] -- cgit v1.2.3