diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-10-20 12:46:27 +0200 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2025-10-23 16:20:22 +0100 |
| commit | ee17073ebb3f7a46a14cd3c6eca73af317df26cf (patch) | |
| tree | b2dc8996e23b3995b051d6f777eddfda842bda1d | |
| parent | 8f8aade528c6cc4b812e063ce95b6705a040f61b (diff) | |
| download | meson-ee17073ebb3f7a46a14cd3c6eca73af317df26cf.tar.gz | |
build: allow building staticlib and rlib together
Fixes: #15028
| -rw-r--r-- | mesonbuild/build.py | 2 | ||||
| -rw-r--r-- | 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. |