From 36efaf8437fd3926868293c87fa6cffc6f309bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Rakic?= <remy.rakic@gmail.com>
Date: Wed, 5 Mar 2025 10:54:11 +0100
Subject: [PATCH] normalize away `-Wlinker-messages` wrappers from `rust-lld`
rmake test
---
tests/run-make/rust-lld/rmake.rs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/run-make/rust-lld/rmake.rs b/tests/run-make/rust-lld/rmake.rs
index e5ae9435388..35f716c24c7 100644
--- a/tests/run-make/rust-lld/rmake.rs
+++ b/tests/run-make/rust-lld/rmake.rs
@@ -60,7 +60,8 @@ fn main() {
}
fn find_lld_version_in_logs(stderr: String) -> bool {
- let lld_version_re =
- Regex::new(r"^warning: linker std(out|err): LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
+ // Strip the `-Wlinker-messages` wrappers prefixing the linker output.
+ let stderr = Regex::new(r"warning: linker std(out|err):").unwrap().replace_all(&stderr, "");
+ let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
stderr.lines().any(|line| lld_version_re.is_match(line.trim()))
}