Auto merge of #98731 - InfRandomness:fix-#98728, r=Mark-Simulacrum

Revert #95993 fix

This reverts the temporary fix implemented by https://github.com/rust-lang/rust/pull/95993 since a permanent fix has been implemented by https://github.com/rust-lang/cargo/pull/10594

Fixes https://github.com/rust-lang/rust/issues/98728
This commit is contained in:
bors 2022-07-04 03:54:47 +00:00
commit a5c6a48aee

View File

@ -31,9 +31,7 @@ fn main() {
let mut cmd = Command::new(rustdoc);
// cfg(bootstrap)
// NOTE: the `--test` special-casing can be removed when https://github.com/rust-lang/cargo/pull/10594 lands on beta.
if target.is_some() || args.iter().any(|x| x == "--test") {
if target.is_some() {
// The stage0 compiler has a special sysroot distinct from what we
// actually downloaded, so we just always pass the `--sysroot` option,
// unless one is already set.