diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-05-08 22:13:39 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-10 19:06:00 +0300 |
| commit | d298a00afb4286ce7dfae231c311500e0d3de728 (patch) | |
| tree | 92232e0eea0af944a731870a69a872fbebce9063 | |
| parent | d87925dc3a45fce97603b6165fb489c30e004b4d (diff) | |
| download | meson-d298a00afb4286ce7dfae231c311500e0d3de728.zip meson-d298a00afb4286ce7dfae231c311500e0d3de728.tar.gz meson-d298a00afb4286ce7dfae231c311500e0d3de728.tar.bz2 | |
boost: Do not be strict about static if not specified (fixes #7057)
| -rw-r--r-- | mesonbuild/dependencies/boost.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py index fb9d573..3262d8b 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py @@ -344,6 +344,7 @@ class BoostDependency(ExternalDependency): self.multithreading = kwargs.get('threading', 'multi') == 'multi' self.boost_root = None + self.explicit_static = 'static' in kwargs # Extract and validate modules self.modules = mesonlib.extract_as_list(kwargs, 'modules') # type: T.List[str] @@ -522,7 +523,7 @@ class BoostDependency(ExternalDependency): except (KeyError, IndexError, AttributeError): pass - libs = [x for x in libs if x.static == self.static] + libs = [x for x in libs if x.static == self.static or not self.explicit_static] libs = [x for x in libs if x.mt == self.multithreading] libs = [x for x in libs if x.version_matches(lib_vers)] libs = [x for x in libs if x.arch_matches(self.arch)] |