From 8725f7ee4c4af1c961464117aa9f643bae859924 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Thu, 8 Aug 2024 12:16:29 +0000 Subject: [PATCH] run-make: enable msvc for staticlib-dylib-linkage --- tests/run-make/staticlib-dylib-linkage/rmake.rs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/run-make/staticlib-dylib-linkage/rmake.rs b/tests/run-make/staticlib-dylib-linkage/rmake.rs index 415491bb8ee..8dd1ac0ffbd 100644 --- a/tests/run-make/staticlib-dylib-linkage/rmake.rs +++ b/tests/run-make/staticlib-dylib-linkage/rmake.rs @@ -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::>(); - cc().input("foo.c").arg("-lfoo").args(library_search_paths).out_exe("foo").run(); + let mut native_link_args = native_link_args.split(' ').collect::>(); + 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"); }