itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily fix standard_lib tests on linux.

Browse Source
This commit is contained in:
Eric Huss 2024-05-18 14:00:06 -07:00
parent 0de7f2ec6c
commit 473e770cdd
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/testsuite/standard_lib.rs
View File

@ -96,8 +96,19 @@ fn setup() -> Setup {
args.push(env::var("REAL_SYSROOT").unwrap()); args.push(env::var("REAL_SYSROOT").unwrap());
} else if args.iter().any(|arg| arg == "--target") { } else if args.iter().any(|arg| arg == "--target") {
// build-std target unit // 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 { } else {
// host unit, do not use sysroot // host unit, do not use sysroot
} }