Skip to content

Commit 986dac3

Browse files
committed
Auto merge of #13931 - ehuss:standard_lib-no-sysroot, r=weihanglo
Temporarily fix standard_lib tests on linux. This fixes the standard_lib tests which are broken in the latest nightly. The latest nightly now requires rust-lld to be in the sysroot for x86_64-unknown-linux-gnu. This broke these tests which were trying to verify that the standard library is not required. This temporarily removes this validation, but we should have some way of enforcing it (rust-lang/wg-cargo-std-aware#31). cc rust-lang/rust#125246
2 parents 0de7f2e + 473e770 commit 986dac3

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

tests/testsuite/standard_lib.rs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,19 @@ fn setup() -> Setup {
9696
args.push(env::var("REAL_SYSROOT").unwrap());
9797
} else if args.iter().any(|arg| arg == "--target") {
9898
// build-std target unit
99-
args.push("--sysroot".to_string());
100-
args.push("/path/to/nowhere".to_string());
99+
//
100+
// This `--sysroot` is here to disable the sysroot lookup,
101+
// to ensure nothing is required.
102+
// See https://github.com/rust-lang/wg-cargo-std-aware/issues/31
103+
// for more information on this.
104+
//
105+
// FIXME: this is broken on x86_64-unknown-linux-gnu
106+
// due to https://github.com/rust-lang/rust/pull/124129,
107+
// because it requires lld in the sysroot. See
108+
// https://github.com/rust-lang/rust/issues/125246 for
109+
// more information.
110+
// args.push("--sysroot".to_string());
111+
// args.push("/path/to/nowhere".to_string());
101112
} else {
102113
// host unit, do not use sysroot
103114
}

0 commit comments

Comments
 (0)