aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/compilers.py
diff options
context:
space:
mode:
authorJosh Gao <josh@insolit.us>2018-10-27 21:34:20 -0700
committerJussi Pakkanen <jpakkane@gmail.com>2018-10-30 20:25:32 +0200
commitedda80cc75cac9ddd15ba2b8cefc93eefcb736ef (patch)
tree60b8e5300f2ad2c3c4be341161dc921f7bb15ad8 /mesonbuild/compilers/compilers.py
parentd505a68e3489a30ef12f59cbaeef2b9d1bbc3e66 (diff)
downloadmeson-edda80cc75cac9ddd15ba2b8cefc93eefcb736ef.zip
meson-edda80cc75cac9ddd15ba2b8cefc93eefcb736ef.tar.gz
meson-edda80cc75cac9ddd15ba2b8cefc93eefcb736ef.tar.bz2
Generalize gnulike-targeting-windows checks.
Replace several checks against GCC_MINGW or (GCC_MINGW, GCC_CYGWIN) with is_windows_compiler instead, so that clang and other gcc-like compilers using MinGW work appropriately with vs_module_defs, c_winlibs, and cpp_winlibs. Fixes #4434.
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
-rw-r--r--mesonbuild/compilers/compilers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 68fbbfa..137b3f7 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1482,13 +1482,13 @@ class GnuCompiler(GnuLikeCompiler):
raise RuntimeError('Module definitions file should be str')
# On Windows targets, .def files may be specified on the linker command
# line like an object file.
- if self.compiler_type in (CompilerType.GCC_CYGWIN, CompilerType.GCC_MINGW):
+ if self.compiler_type.is_windows_compiler:
return [defsfile]
# For other targets, discard the .def file.
return []
def get_gui_app_args(self, value):
- if self.compiler_type in (CompilerType.GCC_CYGWIN, CompilerType.GCC_MINGW) and value:
+ if self.compiler_type.is_windows_compiler and value:
return ['-mwindows']
return []