add link_arg helper to run_make_support

and use it in the `rust-lld` tests
rust-lang · Apr 15, 2024 · 8acfe9a · 8acfe9a
1 parent 8fa6984
commit 8acfe9a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/tools/run-make-support/src/rustc.rs b/src/tools/run-make-support/src/rustc.rs
@@ -149,6 +149,12 @@ impl Rustc {
         self
     }
 
+    /// Add an extra argument to the linker invocation, via `-Clink-arg`.
+    pub fn link_arg(&mut self, link_arg: &str) -> &mut Self {
+        self.cmd.arg(format!("-Clink-arg={link_arg}"));
+        self
+    }
+
     #[track_caller]
     pub fn run_fail_assert_exit_code(&mut self, code: i32) -> Output {
         let caller_location = std::panic::Location::caller();

diff --git a/tests/run-make/rust-lld-custom-target/rmake.rs b/tests/run-make/rust-lld-custom-target/rmake.rs
@@ -21,7 +21,7 @@ fn main() {
         .env("RUSTC_LOG", "rustc_codegen_ssa::back::link=info")
         .crate_type("cdylib")
         .target("custom-target.json")
-        .arg("-Clink-args=-Wl,-v")
+        .link_arg("-Wl,-v")
         .input("lib.rs")
         .run();
     assert!(
@@ -35,7 +35,7 @@ fn main() {
         .crate_type("cdylib")
         .target("custom-target.json")
         .arg("-Zlinker-features=-lld")
-        .arg("-Clink-args=-Wl,-v")
+        .link_arg("-Wl,-v")
         .input("lib.rs")
         .run();
     assert!(

diff --git a/tests/run-make/rust-lld/rmake.rs b/tests/run-make/rust-lld/rmake.rs
@@ -19,7 +19,7 @@ fn main() {
         .arg("-Zlinker-features=+lld")
         .arg("-Clink-self-contained=+linker")
         .arg("-Zunstable-options")
-        .arg("-Clink-args=-Wl,-v")
+        .link_arg("-Wl,-v")
         .input("main.rs")
         .run();
     assert!(
@@ -30,7 +30,7 @@ fn main() {
     // It should not be used when we explictly opt-out of lld.
     let output = rustc()
         .env("RUSTC_LOG", "rustc_codegen_ssa::back::link=info")
-        .arg("-Clink-args=-Wl,-v")
+        .link_arg("-Wl,-v")
         .arg("-Zlinker-features=-lld")
         .input("main.rs")
         .run();
@@ -43,7 +43,7 @@ fn main() {
     // times to rustc.
     let output = rustc()
         .env("RUSTC_LOG", "rustc_codegen_ssa::back::link=info")
-        .arg("-Clink-args=-Wl,-v")
+        .link_arg("-Wl,-v")
         .arg("-Clink-self-contained=+linker")
         .arg("-Zunstable-options")
         .arg("-Zlinker-features=-lld")