diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-11-27 15:47:16 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2024-03-15 11:38:54 -0400 |
| commit | c1076241af11f10acac28d771688bb54c6b0b340 (patch) | |
| tree | 337ac789c919fac824f36807f02874396ce669ce /mesonbuild/backend/backends.py | |
| parent | 6b569527bca9354be77769f91a0607cfd692d861 (diff) | |
| download | meson-c1076241af11f10acac28d771688bb54c6b0b340.tar.gz | |
compilers: No need to pass exe_wrapper everywhere
Places where compiler needs it already have access to Environment object
and can use it directly.
This fixes mypy complaining that not all compilers have self.exe_wrapper
in run() method that got moved to base class.
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index c3be900ab..af730f88e 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -568,13 +568,12 @@ class Backend: else: extra_paths = [] - is_cross_built = not self.environment.machines.matches_build_machine(exe_for_machine) - if is_cross_built and self.environment.need_exe_wrapper(): - exe_wrapper = self.environment.get_exe_wrapper() - if not exe_wrapper or not exe_wrapper.found(): + if self.environment.need_exe_wrapper(exe_for_machine): + if not self.environment.has_exe_wrapper(): msg = 'An exe_wrapper is needed but was not found. Please define one ' \ 'in cross file and check the command and/or add it to PATH.' raise MesonException(msg) + exe_wrapper = self.environment.get_exe_wrapper() else: if exe_cmd[0].endswith('.jar'): exe_cmd = ['java', '-jar'] + exe_cmd |
