diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-10-31 10:42:07 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-11-19 10:48:48 -0800 |
| commit | fc93ef0370dc2e4cb44fe4abf5729be3e3e3a6c3 (patch) | |
| tree | 95c74f937c8f2a8cf5972f3785a07f7f41628a3c /mesonbuild/compilers/rust.py | |
| parent | a6c4a4d7e867db4f98db1127d1246c43c5c7a863 (diff) | |
| download | meson-fc93ef0370dc2e4cb44fe4abf5729be3e3e3a6c3.tar.gz | |
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
Diffstat (limited to 'mesonbuild/compilers/rust.py')
| -rw-r--r-- | mesonbuild/compilers/rust.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py index 55c58b56a..a6954f866 100644 --- a/mesonbuild/compilers/rust.py +++ b/mesonbuild/compilers/rust.py @@ -98,12 +98,10 @@ class RustCompiler(Compiler): } def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice, - is_cross: bool, env: Environment, - full_version: T.Optional[str] = None, + env: Environment, full_version: T.Optional[str] = None, linker: T.Optional['DynamicLinker'] = None): super().__init__([], exelist, version, for_machine, env, - is_cross=is_cross, full_version=full_version, - linker=linker) + full_version=full_version, linker=linker) self.rustup_run_and_args: T.Optional[T.Tuple[T.List[str], T.List[str]]] = get_rustup_run_and_args(exelist) self.base_options.update({OptionKey(o) for o in ['b_colorout', 'b_coverage', 'b_ndebug', 'b_pgo']}) if isinstance(self.linker, VisualStudioLikeLinkerMixin): @@ -462,7 +460,7 @@ class RustCompiler(Compiler): return None return RustdocTestCompiler(exelist, self.version, self.for_machine, - self.is_cross, self.environment, + self.environment, full_version=self.full_version, linker=self.linker, rustc=self) @@ -494,10 +492,10 @@ class RustdocTestCompiler(RustCompiler): id = 'rustdoc --test' def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice, - is_cross: bool, env: Environment, full_version: T.Optional[str], + env: Environment, full_version: T.Optional[str], linker: T.Optional['DynamicLinker'], rustc: RustCompiler): super().__init__(exelist, version, for_machine, - is_cross, env, full_version, linker) + env, full_version, linker) self.rustc = rustc @functools.lru_cache(maxsize=None) |
