aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-01-08 15:35:22 -0500
committerXavier Claessens <xclaesse@gmail.com>2023-01-08 18:02:37 -0500
commitb9b27d37c95a080ad9a7455d1d74672a98196dfe (patch)
treea0b22fd1ceb54280d5ba1ede93ab195332683c39
parent9f12f6e1586b91e10ec950d0e334b3d1159d00b7 (diff)
downloadmeson-b9b27d37c95a080ad9a7455d1d74672a98196dfe.zip
meson-b9b27d37c95a080ad9a7455d1d74672a98196dfe.tar.gz
meson-b9b27d37c95a080ad9a7455d1d74672a98196dfe.tar.bz2
avoid detecting masm as a MSVC-like compiler for detecting showincludes
It's msvc-like but, just like Intel Fortran, doesn't support this argument.
-rw-r--r--mesonbuild/backend/ninjabackend.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 3e3c770..093e2ef 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -512,8 +512,8 @@ class NinjaBackend(backends.Backend):
for compiler in self.environment.coredata.compilers.host.values():
# Have to detect the dependency format
- # IFort on windows is MSVC like, but doesn't have /showincludes
- if compiler.language == 'fortran':
+ # IFort / masm on windows is MSVC like, but doesn't have /showincludes
+ if compiler.language in {'fortran', 'masm'}:
continue
if compiler.id == 'pgi' and mesonlib.is_windows():
# for the purpose of this function, PGI doesn't act enough like MSVC