nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-13 23:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #128823 - ChrisDenton:staticlib, r=jieyouxu

Browse Source 
run-make: enable msvc for staticlib-dylib-linkage

`-Zstaticlib-allow-rdylib-deps` on MSVC returns things like `/LIBPATH:R:\rust\build\x86_64-pc-windows-msvc\test\run-make\staticlib-dylib-linkage\rmake_out`. That is a linker argument rather than a `cc` argument. Which makes sense because rustc interacts directly with the linker on MSVC targets. So we need to tell the C compiler to pass on the arguments to the linker.

try-job: x86_64-msvc
try-job: i686-msvc
This commit is contained in:
Matthias Krüger 2024-08-09 05:52:16 +02:00 committed by GitHub
commit 521e75412f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/run-make/staticlib-dylib-linkage/rmake.rs
View File

@ -8,13 +8,8 @@
// Reason: the compiled binary is executed.
//@ ignore-wasm
// Reason: WASM does not support dynamic libraries
//@ ignore-msvc
//FIXME(Oneirical): Getting this to work on MSVC requires passing libcmt.lib to CC,
// which is not trivial to do.
// Tracking issue: https://github.com/rust-lang/rust/issues/128602
// Discussion: https://github.com/rust-lang/rust/pull/128407#discussion_r1702439172
use run_make_support::{cc, regex, run, rustc};
use run_make_support::{cc, is_msvc, regex, run, rustc, static_lib_name};
fn main() {
rustc().arg("-Cprefer-dynamic").input("bar.rs").run();
@ -29,9 +24,13 @@ fn main() {
let re = regex::Regex::new(r#"note: native-static-libs:\s*(.+)"#).unwrap();
let libs = re.find(&libs).unwrap().as_str().trim();
// remove the note
let (_, library_search_paths) = libs.split_once("note: native-static-libs: ").unwrap();
let (_, native_link_args) = libs.split_once("note: native-static-libs: ").unwrap();
// divide the command-line arguments in a vec
let library_search_paths = library_search_paths.split(' ').collect::<Vec<&str>>();
cc().input("foo.c").arg("-lfoo").args(library_search_paths).out_exe("foo").run();
let mut native_link_args = native_link_args.split(' ').collect::<Vec<&str>>();
if is_msvc() {
// For MSVC pass the arguments on to the linker.
native_link_args.insert(0, "-link");
}
cc().input("foo.c").input(static_lib_name("foo")).args(native_link_args).out_exe("foo").run();
run("foo");
}