diff options
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/meson_exe.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py index a70acca..ee5906b 100644 --- a/mesonbuild/scripts/meson_exe.py +++ b/mesonbuild/scripts/meson_exe.py @@ -19,6 +19,8 @@ import pickle import platform import subprocess +from .. import mesonlib + options = None def buildparser(): @@ -49,7 +51,7 @@ def run_exe(exe): if exe.exe_runner is None: raise AssertionError('BUG: Trying to run cross-compiled exes with no wrapper') else: - cmd = [exe.exe_runner] + exe.fname + cmd = exe.exe_runner.get_command() + exe.fname else: cmd = exe.fname child_env = os.environ.copy() @@ -57,7 +59,7 @@ def run_exe(exe): if len(exe.extra_paths) > 0: child_env['PATH'] = (os.pathsep.join(exe.extra_paths + ['']) + child_env['PATH']) - if exe.exe_runner and 'wine' in exe.exe_runner: + if exe.exe_runner and mesonlib.substring_is_in_list('wine', exe.exe_runner.get_command()): wine_paths = ['Z:' + p for p in exe.extra_paths] wine_path = ';'.join(wine_paths) # Don't accidentally end with an `;` because that will add the |