Skip to content

Commit

Permalink
Unrolled build for rust-lang#136626
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#136626 - onur-ozkan:initial-rustdoc, r=jieyouxu

create `initial_rustdoc` field in `Build`

just a minor improvement
  • Loading branch information
rust-timer authored Feb 8, 2025
2 parents 73bf794 + d31dd48 commit 0fdb8b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ impl Step for Rustdoc {
if !target_compiler.is_snapshot(builder) {
panic!("rustdoc in stage 0 must be snapshot rustdoc");
}
return builder.initial_rustc.with_file_name(exe("rustdoc", target_compiler.host));
return builder.initial_rustdoc.clone();
}
let target = target_compiler.host;

Expand Down
2 changes: 2 additions & 0 deletions src/bootstrap/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ pub struct Build {
targets: Vec<TargetSelection>,

initial_rustc: PathBuf,
initial_rustdoc: PathBuf,
initial_cargo: PathBuf,
initial_lld: PathBuf,
initial_relative_libdir: PathBuf,
Expand Down Expand Up @@ -354,6 +355,7 @@ impl Build {
initial_lld,
initial_relative_libdir,
initial_rustc: config.initial_rustc.clone(),
initial_rustdoc: config.initial_rustc.with_file_name(exe("rustdoc", config.build)),
initial_cargo: config.initial_cargo.clone(),
initial_sysroot: config.initial_sysroot.clone(),
local_rebuild: config.local_rebuild,
Expand Down

0 comments on commit 0fdb8b2

Please sign in to comment.