diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch b/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch deleted file mode 100644 index 2faeda2e71..0000000000 --- a/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 25 Mar 2019 17:17:06 +0100 | ||
4 | Subject: [PATCH] environment.py: detect windows also if the system string | ||
5 | contains 'mingw' | ||
6 | |||
7 | Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | |||
10 | --- | ||
11 | mesonbuild/envconfig.py | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | ||
15 | index 03c6346..a59cd89 100644 | ||
16 | --- a/mesonbuild/envconfig.py | ||
17 | +++ b/mesonbuild/envconfig.py | ||
18 | @@ -198,7 +198,7 @@ class MachineInfo: | ||
19 | """ | ||
20 | Machine is windows? | ||
21 | """ | ||
22 | - return self.system in {'windows', 'mingw'} | ||
23 | + return self.system == 'windows' or 'mingw' in self.system | ||
24 | |||
25 | def is_cygwin(self) -> bool: | ||
26 | """ | ||
27 | -- | ||
28 | 2.17.1 | ||
29 | |||