diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-06-27 08:59:16 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-27 21:06:41 +0300 |
| commit | 6e4e0028a1f9f0035ad27e8dc7788bbe67c51053 (patch) | |
| tree | af774ddbdabef5291fd8889f6c1b86ce6d23b5ea /mesonbuild/scripts | |
| parent | af1a81fffc43b2b09c4041076b492e9777d1ecdf (diff) | |
| download | meson-6e4e0028a1f9f0035ad27e8dc7788bbe67c51053.zip meson-6e4e0028a1f9f0035ad27e8dc7788bbe67c51053.tar.gz meson-6e4e0028a1f9f0035ad27e8dc7788bbe67c51053.tar.bz2 | |
meson_exe: Don't assert that we need an exe_wrapper when we say we don't need one
Fixes cross compiling mesa from x86_64 -> x86 on an x86_64 system.
Fixes #5567
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/meson_exe.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py index a862ec5..85dfe99 100644 --- a/mesonbuild/scripts/meson_exe.py +++ b/mesonbuild/scripts/meson_exe.py @@ -47,12 +47,12 @@ def run_exe(exe): elif not exe.is_cross and run_with_mono(exe.fname[0]): cmd = ['mono'] + exe.fname else: - if exe.is_cross: + if exe.is_cross and exe.needs_exe_wrapper: if exe.exe_runner is None: - raise AssertionError('BUG: Can\'t run cross-compiled exe {!r}' + raise AssertionError('BUG: Can\'t run cross-compiled exe {!r} ' 'with no wrapper'.format(exe.name)) elif not exe.exe_runner.found(): - raise AssertionError('BUG: Can\'t run cross-compiled exe {!r} with not-found' + raise AssertionError('BUG: Can\'t run cross-compiled exe {!r} with not-found ' 'wrapper {!r}'.format(exe.name, exe.exe_runner.get_path())) else: cmd = exe.exe_runner.get_command() + exe.fname |