bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #125856 - onur-ozkan:bootstrap-submodule-hotfix, r=onur-ozkan

Browse source 
include missing submodule on bootstrap

As of https://github.com/rust-lang/rust/pull/125408 PR, rustbook now relies on dependencies from the "src/doc/book" submodule.

However, bootstrap does not automatically sync this submodule before reading metadata informations. And if the submodule is not present, reading metadata will fail because rustbook's dependencies will be missing.

This change makes "src/doc/book" to be fetched/synced automatically before trying to read metadata.

cc `@Zalathar`
This commit is contained in:
bors 2024-06-01 16:48:46 +00:00
commit a94483a5f2
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/src/lib.rs
View file

@ -469,7 +469,8 @@ impl Build {
// Make sure we update these before gathering metadata so we don't get an error about missing // Make sure we update these before gathering metadata so we don't get an error about missing
// Cargo.toml files. // Cargo.toml files.
let rust_submodules = ["src/tools/cargo", "library/backtrace", "library/stdarch"]; let rust_submodules =
["src/tools/cargo", "src/doc/book", "library/backtrace", "library/stdarch"];
for s in rust_submodules { for s in rust_submodules {
build.update_submodule(Path::new(s)); build.update_submodule(Path::new(s));
} }