From 644c424f0923469f80b04f83cdb7a959dffc4ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 23 Apr 2023 19:42:24 +0300 Subject: [PATCH] rust: Treat cdylib/staticlib like a normal C lib for whole_link_target too --- 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 edf9c1f56756..bcc577d2d455 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1977,7 +1977,7 @@ def generate_rust_target(self, target: build.BuildTarget) -> None: for d in target.link_whole_targets: linkdirs.add(d.subdir) - if d.uses_rust(): + if d.uses_rust() and d.rust_crate_type not in ['staticlib', 'cdylib']: # specify `extern CRATE_NAME=OUTPUT_FILE` for each Rust # dependency, so that collisions with libraries in rustc's # sysroot don't cause ambiguity