From 094c8dc250167f8fe7789c4014014691e89d80cd Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 3 Jul 2017 16:24:14 +0100 Subject: 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. --- mesonbuild/backend/ninjabackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 3b2a94173..d169c840c 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 -- cgit v1.2.3