From 6383eb227992a3ae77182a990b9b5ce2175846f2 Mon Sep 17 00:00:00 2001 From: Zach Reizner Date: Fri, 28 Jan 2022 16:19:00 -0500 Subject: ninjabackend: treat link_whole_targets like link_targets for Rust targets For static library crates that depend on other internal static library crates, all link_with targets get promoted to link_whole targets. Due to a bug, only link_with targets are considered when generating a Rust target for the ninja backend. This made it impossible to link a Rust static library with another internal Rust static library. This change fixes that issue by chaining link_whole_targets with link_targets, just like many other languages within the ninja backend. --- mesonbuild/backend/ninjabackend.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 75dd535..080d009 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1662,7 +1662,10 @@ class NinjaBackend(backends.Backend): self.generate_generator_list_rules(target) # dependencies need to cause a relink, they're not just for odering - deps = [os.path.join(t.subdir, t.get_filename()) for t in target.link_targets] + deps = [ + os.path.join(t.subdir, t.get_filename()) + for t in itertools.chain(target.link_targets, target.link_whole_targets) + ] orderdeps: T.List[str] = [] @@ -1713,7 +1716,7 @@ class NinjaBackend(backends.Backend): args += rustc.get_output_args(os.path.join(target.subdir, target.get_filename())) linkdirs = mesonlib.OrderedSet() external_deps = target.external_deps.copy() - for d in target.link_targets: + for d in itertools.chain(target.link_targets, target.link_whole_targets): linkdirs.add(d.subdir) if d.uses_rust(): # specify `extern CRATE_NAME=OUTPUT_FILE` for each Rust -- cgit v1.1