From 473e770cddb8563fc6c0cab709e9db316f352d1e Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sat, 18 May 2024 14:00:06 -0700 Subject: [PATCH] Temporarily fix standard_lib tests on linux. --- tests/testsuite/standard_lib.rs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/testsuite/standard_lib.rs b/tests/testsuite/standard_lib.rs index d3be303ea8b..82577a57e0b 100644 --- a/tests/testsuite/standard_lib.rs +++ b/tests/testsuite/standard_lib.rs @@ -96,8 +96,19 @@ fn setup() -> Setup { args.push(env::var("REAL_SYSROOT").unwrap()); } else if args.iter().any(|arg| arg == "--target") { // build-std target unit - args.push("--sysroot".to_string()); - args.push("/path/to/nowhere".to_string()); + // + // This `--sysroot` is here to disable the sysroot lookup, + // to ensure nothing is required. + // See https://github.com/rust-lang/wg-cargo-std-aware/issues/31 + // for more information on this. + // + // FIXME: this is broken on x86_64-unknown-linux-gnu + // due to https://github.com/rust-lang/rust/pull/124129, + // because it requires lld in the sysroot. See + // https://github.com/rust-lang/rust/issues/125246 for + // more information. + // args.push("--sysroot".to_string()); + // args.push("/path/to/nowhere".to_string()); } else { // host unit, do not use sysroot }