Skip to content

Commit 2d87a07

Browse files
authored
Rollup merge of #136626 - onur-ozkan:initial-rustdoc, r=jieyouxu
create `initial_rustdoc` field in `Build` just a minor improvement
2 parents 1667e26 + d31dd48 commit 2d87a07

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Diff for: src/bootstrap/src/core/build_steps/tool.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ impl Step for Rustdoc {
582582
if !target_compiler.is_snapshot(builder) {
583583
panic!("rustdoc in stage 0 must be snapshot rustdoc");
584584
}
585-
return builder.initial_rustc.with_file_name(exe("rustdoc", target_compiler.host));
585+
return builder.initial_rustdoc.clone();
586586
}
587587
let target = target_compiler.host;
588588

Diff for: src/bootstrap/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ pub struct Build {
154154
targets: Vec<TargetSelection>,
155155

156156
initial_rustc: PathBuf,
157+
initial_rustdoc: PathBuf,
157158
initial_cargo: PathBuf,
158159
initial_lld: PathBuf,
159160
initial_relative_libdir: PathBuf,
@@ -354,6 +355,7 @@ impl Build {
354355
initial_lld,
355356
initial_relative_libdir,
356357
initial_rustc: config.initial_rustc.clone(),
358+
initial_rustdoc: config.initial_rustc.with_file_name(exe("rustdoc", config.build)),
357359
initial_cargo: config.initial_cargo.clone(),
358360
initial_sysroot: config.initial_sysroot.clone(),
359361
local_rebuild: config.local_rebuild,

0 commit comments

Comments
 (0)