diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-03-22 15:51:48 -0700 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-09-22 07:53:33 -0400 |
| commit | ded5bd77ad4cf078506ec3ed38278cd5d69d510a (patch) | |
| tree | c92d0dbdc684df648803efe3033112988e90e9df /mesonbuild | |
| parent | fa7c7d919a8dbac8f09ef7a043e23116d655033d (diff) | |
| download | meson-ded5bd77ad4cf078506ec3ed38278cd5d69d510a.zip meson-ded5bd77ad4cf078506ec3ed38278cd5d69d510a.tar.gz meson-ded5bd77ad4cf078506ec3ed38278cd5d69d510a.tar.bz2 | |
ZlibSystemDependency: pass libtype to clib_compiler.find_library
Makes it stop reporting that it found a static zlib on Solaris
which does not ship a static library file for libz, and thus allows
"test cases/rust/13 external c dependencies" to pass.
Fixes #10906
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index ec70151..09f55b7 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -536,7 +536,7 @@ class ZlibSystemDependency(SystemDependency): else: libs = ['z'] for lib in libs: - l = self.clib_compiler.find_library(lib, environment, []) + l = self.clib_compiler.find_library(lib, environment, [], self.libtype) h = self.clib_compiler.has_header('zlib.h', '', environment, dependencies=[self]) if l and h[0]: self.is_found = True |