diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch b/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch new file mode 100644 index 0000000000..a5dbb81b08 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00 2001 | ||
5 | From: Jussi Pakkanen <jpakkane@gmail.com> | ||
6 | Date: Sun, 6 Oct 2019 15:17:32 +0300 | ||
7 | Subject: [PATCH] Cross build is defined by the existance of a cross file. | ||
8 | |||
9 | --- | ||
10 | mesonbuild/environment.py | 2 +- | ||
11 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | ||
14 | index e5d041b4..03c65688 100644 | ||
15 | --- a/mesonbuild/environment.py | ||
16 | +++ b/mesonbuild/environment.py | ||
17 | @@ -611,7 +611,7 @@ class Environment: | ||
18 | self.first_invocation = True | ||
19 | |||
20 | def is_cross_build(self) -> bool: | ||
21 | - return not self.machines.matches_build_machine(MachineChoice.HOST) | ||
22 | + return self.coredata.is_cross_build() | ||
23 | |||
24 | def dump_coredata(self): | ||
25 | return coredata.save(self.coredata, self.get_build_dir()) | ||
26 | -- | ||
27 | 2.20.1 | ||
28 | |||