| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 1 | From d9da5e7a16a9397e22a8900fac4b60b40d7f00de Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Mon, 25 Mar 2019 18:18:33 +0100 |
| 4 | Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build |
| 5 | is cross by comparing architectures |
| 6 | |
| 7 | This can, and does, go wrong when our host architecture is same as the target one(e.g. x86_64). |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 11 | |
| 12 | --- |
| 13 | mesonbuild/environment.py | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
| 17 | index d4f0630..c584fa4 100644 |
| 18 | --- a/mesonbuild/environment.py |
| 19 | +++ b/mesonbuild/environment.py |
| 20 | @@ -483,7 +483,7 @@ class Environment: |
| 21 | self.first_invocation = True |
| 22 | |
| 23 | def is_cross_build(self): |
| 24 | - return self.coredata.cross_file is not None |
| 25 | + return self.need_exe_wrapper() |
| 26 | |
| 27 | def dump_coredata(self): |
| 28 | return coredata.save(self.coredata, self.get_build_dir()) |