aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/boost.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-05-01 21:29:53 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-05-03 13:58:52 +0300
commitb75dcd05c536a43bd8b568ca742ea2319542185c (patch)
tree29c53bcf977e29857280b587ee5ec92fcec19d6f /mesonbuild/dependencies/boost.py
parentf8a04f0f76a09e875a2a2235facf9f58bb5031b5 (diff)
downloadmeson-b75dcd05c536a43bd8b568ca742ea2319542185c.zip
meson-b75dcd05c536a43bd8b568ca742ea2319542185c.tar.gz
meson-b75dcd05c536a43bd8b568ca742ea2319542185c.tar.bz2
boost: Do not set BOOST_ALL_DYN_LINK (fixes #7056)
Diffstat (limited to 'mesonbuild/dependencies/boost.py')
-rw-r--r--mesonbuild/dependencies/boost.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index 33408c1..fb9d573 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -637,11 +637,8 @@ class BoostDependency(ExternalDependency):
return BoostIncludeDir(hfile.parents[1], int(m.group(1)))
def _extra_compile_args(self) -> T.List[str]:
- args = [] # type: T.List[str]
- args += ['-DBOOST_ALL_NO_LIB'] # Disable automatic linking
- if not self.static:
- args += ['-DBOOST_ALL_DYN_LINK']
- return args
+ # BOOST_ALL_DYN_LINK should not be required with the known defines below
+ return ['-DBOOST_ALL_NO_LIB'] # Disable automatic linking
# See https://www.boost.org/doc/libs/1_72_0/more/getting_started/unix-variants.html#library-naming