From e03f9cb52debfbbc3d995584b572f219b31dad7f Mon Sep 17 00:00:00 2001
From: Chris Denton <chris@chrisdenton.dev>
Date: Wed, 29 May 2024 13:14:19 +0000
Subject: [PATCH] Convert run-make/windows-safeseh to rmake

---
 src/tools/run-make-support/src/rustc.rs |  6 ++++++
 tests/run-make/windows-safeseh/Makefile | 19 -------------------
 tests/run-make/windows-safeseh/rmake.rs | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 tests/run-make/windows-safeseh/Makefile
 create mode 100644 tests/run-make/windows-safeseh/rmake.rs

diff --git a/src/tools/run-make-support/src/rustc.rs b/src/tools/run-make-support/src/rustc.rs
index b424ae3f421..5dde0f91fea 100644
--- a/src/tools/run-make-support/src/rustc.rs
+++ b/src/tools/run-make-support/src/rustc.rs
@@ -203,6 +203,12 @@ impl Rustc {
         self
     }
 
+    /// Specify the linker
+    pub fn linker(&mut self, linker: &str) -> &mut Self {
+        self.cmd.arg(format!("-Clinker={linker}"));
+        self
+    }
+
     /// Get the [`Output`] of the finished process.
     #[track_caller]
     pub fn command_output(&mut self) -> ::std::process::Output {
diff --git a/tests/run-make/windows-safeseh/Makefile b/tests/run-make/windows-safeseh/Makefile
deleted file mode 100644
index d6a403961d7..00000000000
--- a/tests/run-make/windows-safeseh/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# only-windows
-# needs-rust-lld
-
-include ../tools.mk
-
-all: foo bar
-
-# Ensure that LLD can link when an .rlib contains a synthetic object
-# file referencing exported or used symbols.
-foo:
-	$(RUSTC) -C linker=rust-lld foo.rs
-
-# Ensure that LLD can link when /WHOLEARCHIVE: is used with an .rlib.
-# Previously, lib.rmeta was not marked as (trivially) SAFESEH-aware.
-bar: baz
-	$(RUSTC) -C linker=rust-lld -C link-arg=/WHOLEARCHIVE:libbaz.rlib bar.rs
-
-baz:
-	$(RUSTC) baz.rs
diff --git a/tests/run-make/windows-safeseh/rmake.rs b/tests/run-make/windows-safeseh/rmake.rs
new file mode 100644
index 00000000000..10e6b38aa8d
--- /dev/null
+++ b/tests/run-make/windows-safeseh/rmake.rs
@@ -0,0 +1,15 @@
+//@ only-windows
+//@ needs-rust-lld
+
+use run_make_support::rustc;
+
+fn main() {
+    // Ensure that LLD can link when an .rlib contains a synthetic object
+    // file referencing exported or used symbols.
+    rustc().input("foo.rs").linker("rust-lld").run();
+
+    // Ensure that LLD can link when /WHOLEARCHIVE: is used with an .rlib.
+    // Previously, lib.rmeta was not marked as (trivially) SAFESEH-aware.
+    rustc().input("baz.rs").run();
+    rustc().input("bar.rs").linker("rust-lld").link_arg("/WHOLEARCHIVE:libbaz.rlib").run();
+}