diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-10-20 11:32:16 +0200 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2025-10-23 16:20:22 +0100 |
| commit | 8f8aade528c6cc4b812e063ce95b6705a040f61b (patch) | |
| tree | 50050ab42ad817afe9ba4331c32f5be4e054f422 /test cases | |
| parent | b695f2d617fb965e364e8b05bd3f03490567782a (diff) | |
| download | meson-8f8aade528c6cc4b812e063ce95b6705a040f61b.tar.gz | |
cargo: use both_libraries when appropriate
Fixes: #15028
Diffstat (limited to 'test cases')
4 files changed, 4 insertions, 4 deletions
diff --git a/test cases/rust/22 cargo subproject/meson.build b/test cases/rust/22 cargo subproject/meson.build index 7e2c66288..3a79bc8a6 100644 --- a/test cases/rust/22 cargo subproject/meson.build +++ b/test cases/rust/22 cargo subproject/meson.build @@ -1,6 +1,6 @@ project('cargo subproject', 'c') -foo_dep = dependency('foo-0-cdylib') +foo_dep = dependency('foo-0') exe = executable('app', 'main.c', dependencies: foo_dep, ) diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap index d12172bf3..c39970188 100644 --- a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap +++ b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap @@ -2,4 +2,4 @@ method = cargo [provide] -dependency_names = foo-0-cdylib +dependency_names = foo-0 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 dd8525b54..acbd56efe 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 = ["cdylib"] +crate-type = ["staticlib", "cdylib"] path = "lib.rs" # This dependency does not exist, verify optional works. diff --git a/test cases/rust/30 cargo workspace/meson.build b/test cases/rust/30 cargo workspace/meson.build index fab1954c6..4d69fdfc0 100644 --- a/test cases/rust/30 cargo workspace/meson.build +++ b/test cases/rust/30 cargo workspace/meson.build @@ -6,7 +6,7 @@ e = executable('test-foo-1-rs', 'test_foo_1.rs', ) test('test-foo-1-rs', e) -foo_cdylib = dependency('foo-1-cdylib') +foo_cdylib = dependency('foo-1') e = executable('test-foo-1-cdylib', 'test_foo_1.c', dependencies: [foo_cdylib], ) |