From edda80cc75cac9ddd15ba2b8cefc93eefcb736ef Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Sat, 27 Oct 2018 21:34:20 -0700 Subject: 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. --- mesonbuild/compilers/compilers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild/compilers/compilers.py') 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 [] -- cgit v1.1