diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2024-07-11 22:31:39 +0200 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2024-07-16 02:01:21 -0400 |
| commit | d9e2dd6c806b5edf0f686c088fff2b3836ba1624 (patch) | |
| tree | 42574611b21dd495940435814681c6a0c675d67c /mesonbuild/compilers/rust.py | |
| parent | 2a8bb3b9f10f180c50930db92eaf23e8c4c9b81a (diff) | |
| download | meson-d9e2dd6c806b5edf0f686c088fff2b3836ba1624.tar.gz | |
Revert various cross compile changes
c1076241af11f10acac28d771688bb54c6b0b340 changed the logic in multiple
places, in particular it looks like it was assumed that is_cross is always
the same as need_exe_wrapper(), but that's not true.
Also the commit only talks about mypy, so this was definitely not intended.
This reverts all the cases where need_exe_wrapper() was introduced back to
is_cross.
The change in backends.py could be a correct simplification, but I don't know
the code base enough, so reverting that too.
See #13403 and #13410
Diffstat (limited to 'mesonbuild/compilers/rust.py')
| -rw-r--r-- | mesonbuild/compilers/rust.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py index 7bcab3ab4..d071559da 100644 --- a/mesonbuild/compilers/rust.py +++ b/mesonbuild/compilers/rust.py @@ -87,7 +87,7 @@ class RustCompiler(Compiler): if pc.returncode != 0: raise EnvironmentException(f'Rust compiler {self.name_string()} cannot compile programs.') self._native_static_libs(work_dir, source_name) - if environment.need_exe_wrapper(self.for_machine): + if self.is_cross: if not environment.has_exe_wrapper(): # Can't check if the binaries run so we have to assume they do return |