aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/build.py
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-11-25 21:19:32 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2021-11-27 20:16:34 +0200
commit91a099f3a7d2d3f2986e7e7e5949a7f73c2bdc79 (patch)
tree2efc21ee06cfbe2d0cb9f338bd16997ee454e881 /mesonbuild/build.py
parentc2956269f558c59e6dcf166ada805afc9c2f5034 (diff)
downloadmeson-91a099f3a7d2d3f2986e7e7e5949a7f73c2bdc79.zip
meson-91a099f3a7d2d3f2986e7e7e5949a7f73c2bdc79.tar.gz
meson-91a099f3a7d2d3f2986e7e7e5949a7f73c2bdc79.tar.bz2
Remove premature return in BuildTarget.check_module_linking()
We want to loop over all link_targets to update backwards_compat_want_soname if necessary. Fixes: ec9bdc6edb17d1d9da5df2d6525025242c119f3a
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r--mesonbuild/build.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index ad18a7f..d755f16 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -1588,7 +1588,7 @@ You probably should put it in link_with instead.''')
Warn if shared modules are linked with target: (link_with) #2865
'''
for link_target in self.link_targets:
- if isinstance(link_target, SharedModule):
+ if isinstance(link_target, SharedModule) and not link_target.backwards_compat_want_soname:
if self.environment.machines[self.for_machine].is_darwin():
raise MesonException(
f'target {self.name} links against shared module {link_target.name}. This is not permitted on OSX')
@@ -1601,7 +1601,6 @@ You probably should put it in link_with instead.''')
'\n '
'use shared_libary() with `override_options: [\'b_lundef=false\']` instead.')
link_target.backwards_compat_want_soname = True
- return
class Generator(HoldableObject):
def __init__(self, exe: T.Union['Executable', programs.ExternalProgram],