Skip to content

Commit

Permalink
Revert rust-lang#95993 fix
Browse files Browse the repository at this point in the history
This reverts the temporary fix implemented by rust-lang#95993 since a permanent fix has been implemented by rust-lang/cargo#10594
  • Loading branch information
b-ncMN committed Jun 30, 2022
1 parent 5d3c6d6 commit 81b525e
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/bootstrap/bin/rustdoc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 81b525e

Please sign in to comment.