Rollup merge of #128696 - Oneirical:second-linkage-rampage, r=jieyouxu

Migrate `staticlib-dylib-linkage` `run-make` test to rmake Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). I'm quite sure this has the same issue as the one brought up in [this discussion](#128407 (comment)), so I elected to keep the ignore MSVC. try-job: aarch64-apple try-job: x86_64-gnu-llvm-17 try-job: armhf-gnu
rust-lang · Aug 7, 2024 · 26787a8 · 26787a8
2 parents 38dc3b2 608b322
commit 26787a8
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 22 deletions.
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -20,7 20,6 @@ run-make/remap-path-prefix-dwarf/Makefile
 run-make/reproducible-build/Makefile
 run-make/rlib-format-packed-bundled-libs/Makefile
 run-make/split-debuginfo/Makefile
-run-make/staticlib-dylib-linkage/Makefile
 run-make/symbol-mangling-hashed/Makefile
 run-make/sysroot-crates-are-unstable/Makefile
 run-make/thumb-none-qemu/Makefile

diff --git a/tests/run-make/staticlib-dylib-linkage/Makefile b/tests/run-make/staticlib-dylib-linkage/Makefile
diff --git a/tests/run-make/staticlib-dylib-linkage/rmake.rs b/tests/run-make/staticlib-dylib-linkage/rmake.rs
@@ -0,0 1,37 @@
 // A basic smoke test to check that rustc supports linking to a rust dylib with
 // --crate-type staticlib. bar is a dylib, on which foo is dependent - the native
 // static lib search paths are collected and used to compile foo.c, the final executable
 // which depends on both foo and bar.
 // See https://github.com/rust-lang/rust/pull/106560
 
 //@ ignore-cross-compile
 // 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};
 
 fn main() {
  rustc().arg("-Cprefer-dynamic").input("bar.rs").run();
  let libs = rustc()
  .input("foo.rs")
  .crate_type("staticlib")
  .print("native-static-libs")
  .arg("-Zstaticlib-allow-rdylib-deps")
  .run()
  .assert_stderr_contains("note: native-static-libs: ")
  .stderr_utf8();
  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();
  // 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();
  run("foo");
 }