From 6e4e0028a1f9f0035ad27e8dc7788bbe67c51053 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 27 Jun 2019 08:59:16 -0700 Subject: 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 --- mesonbuild/backend/backends.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 3c18b14..b9bf166 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -70,7 +70,7 @@ class TargetInstallData: class ExecutableSerialisation: def __init__(self, name, fname, cmd_args, env, is_cross, exe_wrapper, - workdir, extra_paths, capture): + workdir, extra_paths, capture, needs_exe_wrapper: bool): self.name = name self.fname = fname self.cmd_args = cmd_args @@ -79,6 +79,7 @@ class ExecutableSerialisation: if exe_wrapper is not None: assert(isinstance(exe_wrapper, dependencies.ExternalProgram)) self.exe_runner = exe_wrapper + self.needs_exe_wrapper = needs_exe_wrapper self.workdir = workdir self.extra_paths = extra_paths self.capture = capture @@ -372,7 +373,8 @@ class Backend: exe_wrapper = None es = ExecutableSerialisation(basename, exe_cmd, cmd_args, env, is_cross_built, exe_wrapper, workdir, - extra_paths, capture) + extra_paths, capture, + self.environment.need_exe_wrapper()) pickle.dump(es, f) return exe_data -- cgit v1.1