Skip to content

Commit eafe994

Browse files
authored
Unrolled build for #144453
Rollup merge of #144453 - WaffleLapkin:canonical-build-root, r=jieyouxu canonicalize build root in `tests/run-make/linker-warning` r? jieyouxu This is similar to #139823 -- the test fails for me because my build dir is a symlink.
2 parents 283a074 + 25036f5 commit eafe994

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tests/run-make/linker-warning/rmake.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ fn main() {
6464
.normalize(r#"/rustc[^/_-]*/"#, "/rustc/")
6565
.normalize("libpanic_abort", "libpanic_unwind")
6666
.normalize(
67-
regex::escape(run_make_support::build_root().to_str().unwrap()),
67+
regex::escape(
68+
run_make_support::build_root().canonicalize().unwrap().to_str().unwrap(),
69+
),
6870
"/build-root",
6971
)
7072
.normalize(r#""[^"]*\/symbols.o""#, "\"/symbols.o\"")

0 commit comments

Comments
 (0)