aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-08-23 09:04:57 -0700
committerJussi Pakkanen <jpakkane@gmail.com>2019-08-27 21:07:12 +0300
commitfe645a0a9e2da230d2c500af1f5b2db5da1e364d (patch)
treeeae717ce890472ba3137b8d15fa27efca32dc80d
parentd3a7537346a163d37db040d8437901165844d62d (diff)
downloadmeson-fe645a0a9e2da230d2c500af1f5b2db5da1e364d.zip
meson-fe645a0a9e2da230d2c500af1f5b2db5da1e364d.tar.gz
meson-fe645a0a9e2da230d2c500af1f5b2db5da1e364d.tar.bz2
envconfig: make MachineInfo.is_windows and is_cygwin match mesonlib
The mesonlib versions are slightly more specific in what they accept.
-rw-r--r--mesonbuild/envconfig.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index ab39b0d..f7a43a0 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -201,13 +201,13 @@ 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:
"""
Machine is cygwin?
"""
- return self.system == 'cygwin'
+ return self.system.startswith('cygwin')
def is_linux(self) -> bool:
"""