diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-31 21:46:26 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-31 21:46:26 +0300 |
| commit | 519df3defaaa305c0ea824c1b9ce0a77ff711843 (patch) | |
| tree | cc6e784894acdd2b4c488c6b8bf7e51394bc16f2 | |
| parent | 26f647d7281cebd85b1a436b4c8585e7eb76fa8f (diff) | |
| download | meson-519df3defaaa305c0ea824c1b9ce0a77ff711843.zip meson-519df3defaaa305c0ea824c1b9ce0a77ff711843.tar.gz meson-519df3defaaa305c0ea824c1b9ce0a77ff711843.tar.bz2 | |
Only check cl banner string on Windows. Closes #491.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 3018e38..dfd792b 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -136,7 +136,10 @@ class NinjaBackend(backends.Backend): def detect_vs_dep_prefix(self, outfile, tempfilename): '''VS writes its dependency in a locale dependent format. Detect the search prefix to use.''' - if shutil.which('cl') is None: + # Of course there is another program called 'cl' on + # some platforms. Let's just require that on Windows + # cl points to msvc. + if not mesonlib.is_windows() or shutil.which('cl') is None: return outfile outfile.close() open(os.path.join(self.environment.get_scratch_dir(), 'incdetect.c'), |