diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch deleted file mode 100644 index 8cb11879f4..0000000000 --- a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From ec9c4a22424a5d55fcf213a55d03f096ec24bcae 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 84a7596..9a029f4 100644 | ||
18 | --- a/mesonbuild/environment.py | ||
19 | +++ b/mesonbuild/environment.py | ||
20 | @@ -520,7 +520,7 @@ class Environment: | ||
21 | self.first_invocation = True | ||
22 | |||
23 | def is_cross_build(self) -> bool: | ||
24 | - return not self.machines.matches_build_machine(MachineChoice.HOST) | ||
25 | + return self.need_exe_wrapper() | ||
26 | |||
27 | def dump_coredata(self): | ||
28 | return coredata.save(self.coredata, self.get_build_dir()) | ||