From d9da5e7a16a9397e22a8900fac4b60b40d7f00de Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 25 Mar 2019 18:18:33 +0100 Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build is cross by comparing architectures This can, and does, go wrong when our host architecture is same as the target one(e.g. x86_64). Upstream-Status: Pending Signed-off-by: Alexander Kanavin --- mesonbuild/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index d4f0630..c584fa4 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -483,7 +483,7 @@ class Environment: self.first_invocation = True def is_cross_build(self): - return self.coredata.cross_file is not None + return self.need_exe_wrapper() def dump_coredata(self): return coredata.save(self.coredata, self.get_build_dir())