Skip to content

Commit e03f9cb

Browse files
committed
Convert run-make/windows-safeseh to rmake
1 parent e463f6f commit e03f9cb

File tree

3 files changed

+21
-19
lines changed

3 files changed

+21
-19
lines changed

src/tools/run-make-support/src/rustc.rs

+6
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,12 @@ impl Rustc {
203203
self
204204
}
205205

206+
/// Specify the linker
207+
pub fn linker(&mut self, linker: &str) -> &mut Self {
208+
self.cmd.arg(format!("-Clinker={linker}"));
209+
self
210+
}
211+
206212
/// Get the [`Output`] of the finished process.
207213
#[track_caller]
208214
pub fn command_output(&mut self) -> ::std::process::Output {

tests/run-make/windows-safeseh/Makefile

-19
This file was deleted.
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//@ only-windows
2+
//@ needs-rust-lld
3+
4+
use run_make_support::rustc;
5+
6+
fn main() {
7+
// Ensure that LLD can link when an .rlib contains a synthetic object
8+
// file referencing exported or used symbols.
9+
rustc().input("foo.rs").linker("rust-lld").run();
10+
11+
// Ensure that LLD can link when /WHOLEARCHIVE: is used with an .rlib.
12+
// Previously, lib.rmeta was not marked as (trivially) SAFESEH-aware.
13+
rustc().input("baz.rs").run();
14+
rustc().input("bar.rs").linker("rust-lld").link_arg("/WHOLEARCHIVE:libbaz.rlib").run();
15+
}

0 commit comments

Comments
 (0)