diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-03 22:48:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-03 22:48:56 +0200 |
| commit | cf76ffad145eb83a0bbfce89e05b7610637ff293 (patch) | |
| tree | 9d76dd2d2f2398fbca00bdfad434297246338213 /mesonbuild/compilers/c.py | |
| parent | 2cf1e8da15b954725fa9c9467bfb35a516814c89 (diff) | |
| parent | bccb7a8eb8f13fc747f5198ee0d77ecaf1b77be7 (diff) | |
| download | meson-cf76ffad145eb83a0bbfce89e05b7610637ff293.zip meson-cf76ffad145eb83a0bbfce89e05b7610637ff293.tar.gz meson-cf76ffad145eb83a0bbfce89e05b7610637ff293.tar.bz2 | |
Merge pull request #2703 from mesonbuild/msvc-library-search-fixes
Various MSVC library search fixes
Diffstat (limited to 'mesonbuild/compilers/c.py')
| -rw-r--r-- | mesonbuild/compilers/c.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 317a4d7..2d12314 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -727,10 +727,12 @@ class CCompiler(Compiler): if for_darwin(env.is_cross_build(), env): shlibext = ['dylib'] elif for_windows(env.is_cross_build(), env): + # FIXME: .lib files can be import or static so we should read the + # file, figure out which one it is, and reject the wrong kind. if self.id == 'msvc': shlibext = ['lib'] else: - shlibext = ['dll', 'dll.a', 'lib'] + shlibext = ['dll.a', 'lib', 'dll'] # Yep, static libraries can also be foo.lib stlibext += ['lib'] elif for_cygwin(env.is_cross_build(), env): |