diff options
| author | Zach Reizner <zach297@gmail.com> | 2022-01-28 16:19:00 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-02-02 19:36:14 +0200 |
| commit | 6383eb227992a3ae77182a990b9b5ce2175846f2 (patch) | |
| tree | 763b607c4576ecdf51e361ca3720d9b84010c7d1 /test cases | |
| parent | 96df0fc69ea0f0a20519fa784db90aaf890a5f30 (diff) | |
| download | meson-6383eb227992a3ae77182a990b9b5ce2175846f2.zip meson-6383eb227992a3ae77182a990b9b5ce2175846f2.tar.gz meson-6383eb227992a3ae77182a990b9b5ce2175846f2.tar.bz2 | |
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.
Diffstat (limited to 'test cases')
5 files changed, 27 insertions, 0 deletions
diff --git a/test cases/rust/17 staticlib link staticlib/branch.rs b/test cases/rust/17 staticlib link staticlib/branch.rs new file mode 100644 index 0000000..29e1cd0 --- /dev/null +++ b/test cases/rust/17 staticlib link staticlib/branch.rs @@ -0,0 +1,4 @@ +#[no_mangle] +pub extern "C" fn what_have_we_here() -> i32 { + leaf::HOW_MANY * leaf::HOW_MANY +} diff --git a/test cases/rust/17 staticlib link staticlib/leaf.rs b/test cases/rust/17 staticlib link staticlib/leaf.rs new file mode 100644 index 0000000..2c697f7 --- /dev/null +++ b/test cases/rust/17 staticlib link staticlib/leaf.rs @@ -0,0 +1 @@ +pub const HOW_MANY: i32 = 5; diff --git a/test cases/rust/17 staticlib link staticlib/meson.build b/test cases/rust/17 staticlib link staticlib/meson.build new file mode 100644 index 0000000..68d08f3 --- /dev/null +++ b/test cases/rust/17 staticlib link staticlib/meson.build @@ -0,0 +1,8 @@ +project('staticlib link staticlib', 'c', 'rust') + +leaf = static_library('leaf', 'leaf.rs', rust_crate_type : 'rlib') +# Even though leaf is linked using link_with, this gets implicitly promoted to link_whole because +# it is an internal Rust project. +branch = static_library('branch', 'branch.rs', link_with: leaf, rust_crate_type : 'staticlib', install : true) +e = executable('prog', 'prog.c', link_with : branch, install : true) +test('linktest', e) diff --git a/test cases/rust/17 staticlib link staticlib/prog.c b/test cases/rust/17 staticlib link staticlib/prog.c new file mode 100644 index 0000000..853391e --- /dev/null +++ b/test cases/rust/17 staticlib link staticlib/prog.c @@ -0,0 +1,7 @@ +#include <stdio.h> + +int what_have_we_here(); + +int main(void) { + printf("printing %d\n", what_have_we_here()); +} diff --git a/test cases/rust/17 staticlib link staticlib/test.json b/test cases/rust/17 staticlib link staticlib/test.json new file mode 100644 index 0000000..c08ffea --- /dev/null +++ b/test cases/rust/17 staticlib link staticlib/test.json @@ -0,0 +1,7 @@ +{ + "installed": [ + {"type": "exe", "file": "usr/bin/prog"}, + {"type": "pdb", "file": "usr/bin/prog"}, + {"type": "file", "file": "usr/lib/libbranch.a"} + ] +} |