From ee17073ebb3f7a46a14cd3c6eca73af317df26cf Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 20 Oct 2025 12:46:27 +0200 Subject: build: allow building staticlib and rlib together Fixes: #15028 --- mesonbuild/build.py | 2 +- test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 00be8bd57..c80861c84 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -2428,7 +2428,7 @@ class StaticLibrary(BuildTarget): return self.environment.get_static_lib_dir(), '{libdir_static}' def type_suffix(self): - return "@sta" + return "@rlib" if self.uses_rust_abi() else "@sta" def process_kwargs(self, kwargs: StaticLibraryKeywordArguments) -> None: super().process_kwargs(kwargs) diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml index acbd56efe..d1fc74af8 100644 --- a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml +++ b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" edition = "2021" [lib] -crate-type = ["staticlib", "cdylib"] +crate-type = ["lib", "staticlib", "cdylib"] path = "lib.rs" # This dependency does not exist, verify optional works. -- cgit v1.2.3