summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch
blob: 2faeda2e711f419a2cf1583e3782d308ff24f56a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 25 Mar 2019 17:17:06 +0100
Subject: [PATCH] environment.py: detect windows also if the system string
 contains 'mingw'

Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>

---
 mesonbuild/envconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index 03c6346..a59cd89 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -198,7 +198,7 @@ class MachineInfo:
         """
         Machine is windows?
         """
-        return self.system in {'windows', 'mingw'}
+        return self.system == 'windows' or 'mingw' in self.system
 
     def is_cygwin(self) -> bool:
         """
-- 
2.17.1