diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-02-08 21:37:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-08 21:37:25 +0100 |
| commit | 2d87a07e9f968fcfbd79fe158a50d4a29bd02fc0 (patch) | |
| tree | f713eee6893c3ad2bc83eb33ca5646ad9d08fe47 /src | |
| parent | 1667e26616b9c1d78c6a597fafd1b3318ddcba05 (diff) | |
| parent | d31dd48f592a8bcb2c6fe09a81dfb93450b70edb (diff) | |
| download | rust-2d87a07e9f968fcfbd79fe158a50d4a29bd02fc0.tar.gz rust-2d87a07e9f968fcfbd79fe158a50d4a29bd02fc0.zip | |
Rollup merge of #136626 - onur-ozkan:initial-rustdoc, r=jieyouxu
create `initial_rustdoc` field in `Build` just a minor improvement
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/tool.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/lib.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index 75fac88252b..620daec5114 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs @@ -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; diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index 2dd83d5938e..4e097b67503 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -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, @@ -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, |
