diff options
| author | InfRandomness <infrandomness@gmail.com> | 2022-06-30 20:14:46 +0200 |
|---|---|---|
| committer | InfRandomness <infrandomness@gmail.com> | 2022-06-30 20:16:04 +0200 |
| commit | 81b525e2a457f1561a437f47e644d33d46c0ae8a (patch) | |
| tree | b2511219fd840f5df42462143172b2a619338106 | |
| parent | 5d3c6d6c83edc4ef245e77397c8e32d3ee453b67 (diff) | |
| download | rust-81b525e2a457f1561a437f47e644d33d46c0ae8a.tar.gz rust-81b525e2a457f1561a437f47e644d33d46c0ae8a.zip | |
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
| -rw-r--r-- | src/bootstrap/bin/rustdoc.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs index 5f85fc5aa59..87c1d22e771 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs @@ -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. |