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 | 10 |
1 files changed, 5 insertions, 5 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 index 8334714541..8cb11879f4 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From d9da5e7a16a9397e22a8900fac4b60b40d7f00de Mon Sep 17 00:00:00 2001 | 1 | From ec9c4a22424a5d55fcf213a55d03f096ec24bcae Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 25 Mar 2019 18:18:33 +0100 | 3 | Date: Mon, 25 Mar 2019 18:18:33 +0100 |
4 | Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build | 4 | Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build |
@@ -14,14 +14,14 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 16 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
17 | index d4f0630..c584fa4 100644 | 17 | index 84a7596..9a029f4 100644 |
18 | --- a/mesonbuild/environment.py | 18 | --- a/mesonbuild/environment.py |
19 | +++ b/mesonbuild/environment.py | 19 | +++ b/mesonbuild/environment.py |
20 | @@ -483,7 +483,7 @@ class Environment: | 20 | @@ -520,7 +520,7 @@ class Environment: |
21 | self.first_invocation = True | 21 | self.first_invocation = True |
22 | 22 | ||
23 | def is_cross_build(self): | 23 | def is_cross_build(self) -> bool: |
24 | - return self.coredata.cross_file is not None | 24 | - return not self.machines.matches_build_machine(MachineChoice.HOST) |
25 | + return self.need_exe_wrapper() | 25 | + return self.need_exe_wrapper() |
26 | 26 | ||
27 | def dump_coredata(self): | 27 | def dump_coredata(self): |