aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam@afuera.me.uk>2017-07-03 16:24:14 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-07-23 19:34:42 +0300
commit094c8dc250167f8fe7789c4014014691e89d80cd (patch)
tree9bb003429f9875c89b043192a6199fd7644b1be3
parent288c44c0520958c3f307707b8070f2c6c9ea1405 (diff)
downloadmeson-094c8dc250167f8fe7789c4014014691e89d80cd.zip
meson-094c8dc250167f8fe7789c4014014691e89d80cd.tar.gz
meson-094c8dc250167f8fe7789c4014014691e89d80cd.tar.bz2
Consider `link_whole` as well as `link_with` for Vala deps
Otherwise, when you have a static helper library written in Vala that you want to `link_whole` into a shared library you have to manually add the .vapi file as a source.
-rw-r--r--mesonbuild/backend/ninjabackend.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 3b2a941..d169c84 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -995,7 +995,7 @@ int dummy;
the build directory.
"""
result = OrderedSet()
- for dep in target.link_targets:
+ for dep in target.link_targets + target.link_whole_targets:
for i in dep.sources:
if hasattr(i, 'fname'):
i = i.fname