diff options
| author | Josh Gao <josh@insolit.us> | 2018-10-27 21:34:20 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-30 20:25:32 +0200 |
| commit | edda80cc75cac9ddd15ba2b8cefc93eefcb736ef (patch) | |
| tree | 60b8e5300f2ad2c3c4be341161dc921f7bb15ad8 /mesonbuild/compilers/cpp.py | |
| parent | d505a68e3489a30ef12f59cbaeef2b9d1bbc3e66 (diff) | |
| download | meson-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/cpp.py')
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index ac44676..9dc2876 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -202,7 +202,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler): 'cpp_debugstl': coredata.UserBooleanOption('cpp_debugstl', 'STL debug mode', False)}) - if self.compiler_type == CompilerType.GCC_MINGW: + if self.compiler_type.is_windows_compiler: opts.update({ 'cpp_winlibs': coredata.UserArrayOption('cpp_winlibs', 'Standard Win libraries to link against', gnu_winlibs), }) @@ -218,7 +218,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler): return args def get_option_link_args(self, options): - if self.compiler_type == CompilerType.GCC_MINGW: + if self.compiler_type.is_windows_compiler: return options['cpp_winlibs'].value[:] return [] |