diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-11-03 12:44:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 12:44:53 +0100 |
| commit | c0fa97c3d6e86e235d5e1099ebf30289aedb3461 (patch) | |
| tree | 561a6a57f24336d6f6fc98d1add2e95478a74b52 /src/bootstrap | |
| parent | 7a0df44799ad989bcc062c06cc40277969fcee80 (diff) | |
| parent | fedfca71ed556e2ebd879636cec0cb1af4b90218 (diff) | |
| download | rust-c0fa97c3d6e86e235d5e1099ebf30289aedb3461.tar.gz rust-c0fa97c3d6e86e235d5e1099ebf30289aedb3461.zip | |
Rollup merge of #117533 - onur-ozkan:revert-117471, r=onur-ozkan
Revert "bootstrap: do not purge docs on CI environment" This reverts commit 6198e881d363730900b7b0d4fa8311b3844421a7. ref https://github.com/rust-lang/rust/issues/117430#issuecomment-1791609163, https://github.com/rust-lang/rust/pull/117471#issuecomment-1791937529
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/builder.rs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs index 85b9b12c242..44cdbe38de3 100644 --- a/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder.rs @@ -28,7 +28,6 @@ pub use crate::Compiler; // - use std::lazy for `Lazy` // - use std::cell for `OnceCell` // Once they get stabilized and reach beta. -use build_helper::ci::CiEnv; use clap::ValueEnum; use once_cell::sync::{Lazy, OnceCell}; @@ -1275,12 +1274,7 @@ impl<'a> Builder<'a> { self.clear_if_dirty(&out_dir, &backend); } - if cmd == "doc" - || cmd == "rustdoc" - // FIXME: We shouldn't need to check this. - // ref https://github.com/rust-lang/rust/issues/117430#issuecomment-1788160523 - && !CiEnv::is_ci() - { + if cmd == "doc" || cmd == "rustdoc" { let my_out = match mode { // This is the intended out directory for compiler documentation. Mode::Rustc | Mode::ToolRustc => self.compiler_doc_out(target), |