diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2023-01-05 10:26:08 -0800 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2023-02-22 15:35:50 -0800 |
commit | c0db0b73dac284fe0144929b6aca9c386399c004 (patch) | |
tree | 8b6d845c73e3552a3a9e43f53c866ae783939c27 /test cases/rust | |
parent | 81a8c488f007e842e83aa16ba941877250430a15 (diff) | |
download | meson-c0db0b73dac284fe0144929b6aca9c386399c004.zip meson-c0db0b73dac284fe0144929b6aca9c386399c004.tar.gz meson-c0db0b73dac284fe0144929b6aca9c386399c004.tar.bz2 |
Implement rustc controlled whole-archive linking
Rustc as of version 1.61.0 has support for controlling when
whole-archive linking takes place, previous to this it tried to make a
good guess about what you wanted, which worked most of the time. This is
now implemented.
Additionally, rustc makes some assumptions about library names
(specifically static names), that meson does not keep. This can be fixed
with rustc 1.67, where a new +verbatim modifier has been added. We can
then force rustc to use the name we give it. Before that, we can sneak
through `/WHOELARCHIVE:` in cases of dynamic linking (into a dll or
exe), but we can't force the archiver to do what we want (rustc
considers the archiver to be an implementation detail). The only
solution I can come up with is to copy the library to the format that
rustc expects. I've run into some issues with that as well, so we warn
in that case.
The decisions to leave static into static broken on MSVC for 1.61–1.66
was made because:
1) The work around is non-trivial, and we would have to support that
workaround for a long time
2) The number of users of Rust in Meson is small
3) The number of users of Rust in Meson on Windows, with MSVC is tiny
4) Using rustup to update rustc on windows is trivial, and solves the
problem completely
Fixes: #10723
Fixes: #11247
Co-authored-by: Nirbheek Chauhan <nirbheek@centricular.com>
Diffstat (limited to 'test cases/rust')
-rw-r--r-- | test cases/rust/2 sharedlib/meson.build | 5 | ||||
-rw-r--r-- | test cases/rust/2 sharedlib/stuff.rs | 10 | ||||
-rw-r--r-- | test cases/rust/2 sharedlib/value.c | 3 | ||||
-rw-r--r-- | test cases/rust/3 staticlib/meson.build | 6 | ||||
-rw-r--r-- | test cases/rust/3 staticlib/other.rs | 5 | ||||
-rw-r--r-- | test cases/rust/3 staticlib/prog.rs | 4 | ||||
-rw-r--r-- | test cases/rust/3 staticlib/stuff.rs | 13 | ||||
-rw-r--r-- | test cases/rust/3 staticlib/value.c | 5 | ||||
-rw-r--r-- | test cases/rust/5 polyglot static/clib.c | 12 | ||||
-rw-r--r-- | test cases/rust/5 polyglot static/meson.build | 3 | ||||
-rw-r--r-- | test cases/rust/5 polyglot static/prog.c | 5 | ||||
-rw-r--r-- | test cases/rust/5 polyglot static/stuff.rs | 2 | ||||
-rw-r--r-- | test cases/rust/5 polyglot static/test.json | 2 |
13 files changed, 62 insertions, 13 deletions
diff --git a/test cases/rust/2 sharedlib/meson.build b/test cases/rust/2 sharedlib/meson.build index 02b8cf7..295fa04 100644 --- a/test cases/rust/2 sharedlib/meson.build +++ b/test cases/rust/2 sharedlib/meson.build @@ -1,10 +1,11 @@ -project('rust shared library', 'rust') +project('rust shared library', 'rust', 'c') if host_machine.system() == 'darwin' error('MESON_SKIP_TEST: does not work right on macos, please fix!') endif -l = shared_library('stuff', 'stuff.rs', install : true) +s = static_library('static', 'value.c') +l = shared_library('stuff', 'stuff.rs', link_whole : s, install : true) e = executable('prog', 'prog.rs', link_with : l, install : true) if build_machine.system() == 'windows' diff --git a/test cases/rust/2 sharedlib/stuff.rs b/test cases/rust/2 sharedlib/stuff.rs index 8cabc62..e7c0521 100644 --- a/test cases/rust/2 sharedlib/stuff.rs +++ b/test cases/rust/2 sharedlib/stuff.rs @@ -1,3 +1,11 @@ #![crate_name = "stuff"] -pub fn explore() -> &'static str { "librarystring" } +extern "C" { + fn c_value() -> i32; +} + +pub fn explore() -> String { + unsafe { + format!("library{}string", c_value()) + } +} diff --git a/test cases/rust/2 sharedlib/value.c b/test cases/rust/2 sharedlib/value.c new file mode 100644 index 0000000..d17b6de --- /dev/null +++ b/test cases/rust/2 sharedlib/value.c @@ -0,0 +1,3 @@ +int c_value(void) { + return 7; +} diff --git a/test cases/rust/3 staticlib/meson.build b/test cases/rust/3 staticlib/meson.build index 6769564..cf8e103 100644 --- a/test cases/rust/3 staticlib/meson.build +++ b/test cases/rust/3 staticlib/meson.build @@ -1,5 +1,7 @@ -project('rust static library', 'rust') +project('rust static library', 'rust', 'c') -l = static_library('stuff', 'stuff.rs', install : true) +o = static_library('other', 'other.rs') +v = static_library('value', 'value.c') +l = static_library('stuff', 'stuff.rs', link_whole : [o, v], install : true) e = executable('prog', 'prog.rs', link_with : l, install : true) test('linktest', e) diff --git a/test cases/rust/3 staticlib/other.rs b/test cases/rust/3 staticlib/other.rs new file mode 100644 index 0000000..037be33 --- /dev/null +++ b/test cases/rust/3 staticlib/other.rs @@ -0,0 +1,5 @@ +pub fn explore( + value: i32, +) -> String { + format!("library{}string", value) +} diff --git a/test cases/rust/3 staticlib/prog.rs b/test cases/rust/3 staticlib/prog.rs index fbf3181..eee2653 100644 --- a/test cases/rust/3 staticlib/prog.rs +++ b/test cases/rust/3 staticlib/prog.rs @@ -1,3 +1,5 @@ extern crate stuff; -fn main() { println!("printing: {}", stuff::explore()); } +fn main() { + println!("printing: {}", stuff::explore()); +} diff --git a/test cases/rust/3 staticlib/stuff.rs b/test cases/rust/3 staticlib/stuff.rs index 8cabc62..7cfcdff 100644 --- a/test cases/rust/3 staticlib/stuff.rs +++ b/test cases/rust/3 staticlib/stuff.rs @@ -1,3 +1,14 @@ #![crate_name = "stuff"] -pub fn explore() -> &'static str { "librarystring" } +extern crate other; + +extern "C" { + fn c_explore_value() -> i32; +} + +pub fn explore( +) -> String { + unsafe { + other::explore(c_explore_value()) + } +} diff --git a/test cases/rust/3 staticlib/value.c b/test cases/rust/3 staticlib/value.c new file mode 100644 index 0000000..b71c8060 --- /dev/null +++ b/test cases/rust/3 staticlib/value.c @@ -0,0 +1,5 @@ +int +c_explore_value (void) +{ + return 42; +} diff --git a/test cases/rust/5 polyglot static/clib.c b/test cases/rust/5 polyglot static/clib.c new file mode 100644 index 0000000..366dbe5 --- /dev/null +++ b/test cases/rust/5 polyglot static/clib.c @@ -0,0 +1,12 @@ +#include <stdio.h> + +void hello_from_rust(void); + +static void hello_from_c(void) { + printf("Hello from C!\n"); +} + +void hello_from_both(void) { + hello_from_c(); + hello_from_rust(); +} diff --git a/test cases/rust/5 polyglot static/meson.build b/test cases/rust/5 polyglot static/meson.build index b2a44da..bed7977 100644 --- a/test cases/rust/5 polyglot static/meson.build +++ b/test cases/rust/5 polyglot static/meson.build @@ -8,7 +8,8 @@ deps = [ extra_winlibs = meson.get_compiler('c').get_id() in ['msvc', 'clang-cl'] ? ['userenv.lib', 'ws2_32.lib', 'bcrypt.lib'] : [] -l = static_library('stuff', 'stuff.rs', rust_crate_type : 'staticlib', install : true) +r = static_library('stuff', 'stuff.rs', rust_crate_type : 'staticlib') +l = static_library('clib', 'clib.c', link_with : r, install : true) e = executable('prog', 'prog.c', dependencies: deps, link_with : l, diff --git a/test cases/rust/5 polyglot static/prog.c b/test cases/rust/5 polyglot static/prog.c index dbbd880..0a8e0d1 100644 --- a/test cases/rust/5 polyglot static/prog.c +++ b/test cases/rust/5 polyglot static/prog.c @@ -1,8 +1,7 @@ #include <stdio.h> -void f(); +void hello_from_both(); int main(void) { - printf("Hello from C!\n"); - f(); + hello_from_both(); } diff --git a/test cases/rust/5 polyglot static/stuff.rs b/test cases/rust/5 polyglot static/stuff.rs index ecf623c..3777ae8 100644 --- a/test cases/rust/5 polyglot static/stuff.rs +++ b/test cases/rust/5 polyglot static/stuff.rs @@ -1,6 +1,6 @@ #![crate_name = "stuff"] #[no_mangle] -pub extern fn f() { +pub extern "C" fn hello_from_rust() { println!("Hello from Rust!"); } diff --git a/test cases/rust/5 polyglot static/test.json b/test cases/rust/5 polyglot static/test.json index 1d4eff4..cc0d2da 100644 --- a/test cases/rust/5 polyglot static/test.json +++ b/test cases/rust/5 polyglot static/test.json @@ -2,6 +2,6 @@ "installed": [ {"type": "exe", "file": "usr/bin/prog"}, {"type": "pdb", "file": "usr/bin/prog"}, - {"type": "file", "file": "usr/lib/libstuff.a"} + {"type": "file", "file": "usr/lib/libclib.a"} ] } |