From 3268b2e18d33146f7df17b29421f8c6df3737afe Mon Sep 17 00:00:00 2001
From: Chris Denton <chris@chrisdenton.dev>
Date: Sun, 4 Aug 2024 14:59:50 +0000
Subject: [PATCH] Enable msvc for link-args-order
---
tests/run-make/link-args-order/rmake.rs | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/tests/run-make/link-args-order/rmake.rs b/tests/run-make/link-args-order/rmake.rs
index d238ad23f27c7..b7ef8333267f2 100644
--- a/tests/run-make/link-args-order/rmake.rs
+++ b/tests/run-make/link-args-order/rmake.rs
@@ -3,15 +3,14 @@
// checks that linker arguments remain intact and in the order they were originally passed in.
// See https://github.com/rust-lang/rust/pull/70665
-//@ ignore-msvc
-// Reason: the ld linker does not exist on Windows.
-
-use run_make_support::rustc;
+use run_make_support::{is_msvc, rustc};
fn main() {
+ let linker = if is_msvc() { "msvc" } else { "ld" };
+
rustc()
.input("empty.rs")
- .linker_flavor("ld")
+ .linker_flavor(linker)
.link_arg("a")
.link_args("b c")
.link_args("d e")
@@ -20,7 +19,7 @@ fn main() {
.assert_stderr_contains(r#""a" "b" "c" "d" "e" "f""#);
rustc()
.input("empty.rs")
- .linker_flavor("ld")
+ .linker_flavor(linker)
.arg("-Zpre-link-arg=a")
.arg("-Zpre-link-args=b c")
.arg("-Zpre-link-args=d e")