From 21d471673addc6f61329ffe8ac6d4d919c6c70c6 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 20 Feb 2016 01:57:25 +0530 Subject: [PATCH] environment: When using MinGW-GCC, the import lib suffix is dll --- mesonbuild/environment.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 8df856ca7..c43c5e138 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -98,7 +98,12 @@ class Environment(): if (not cross and mesonlib.is_windows()) \ or (cross and self.cross_info.has_host() and self.cross_info.config['host_machine']['system'] == 'windows'): self.exe_suffix = 'exe' - self.import_lib_suffix = 'lib' + if self.detect_c_compiler(cross).get_id() == 'msvc': + self.import_lib_suffix = 'lib' + else: + # MinGW-GCC doesn't generate and can't link with a .lib + # It uses the DLL file as the import library + self.import_lib_suffix = 'dll' self.shared_lib_suffix = 'dll' self.shared_lib_prefix = '' self.static_lib_suffix = 'lib' @@ -546,7 +551,7 @@ class Environment(): def get_exe_suffix(self): return self.exe_suffix - # On Windows the library has suffix dll + # On Windows (MSVC) the library has suffix dll # but you link against a file that has suffix lib. def get_import_lib_suffix(self): return self.import_lib_suffix