| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 1 | From ec9c4a22424a5d55fcf213a55d03f096ec24bcae Mon Sep 17 00:00:00 2001 |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 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 |
| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 17 | index 84a7596..9a029f4 100644 |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 18 | --- a/mesonbuild/environment.py |
| 19 | +++ b/mesonbuild/environment.py |
| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 20 | @@ -520,7 +520,7 @@ class Environment: |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 21 | self.first_invocation = True |
| 22 | |
| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 23 | def is_cross_build(self) -> bool: |
| 24 | - return not self.machines.matches_build_machine(MachineChoice.HOST) |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 25 | + return self.need_exe_wrapper() |
| 26 | |
| 27 | def dump_coredata(self): |
| 28 | return coredata.save(self.coredata, self.get_build_dir()) |