Skip to content

Commit

Permalink
Auto merge of #125856 - onur-ozkan:bootstrap-submodule-hotfix, r=onur…
Browse files Browse the repository at this point in the history
…-ozkan

include missing submodule on bootstrap

As of #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`
  • Loading branch information
bors committed Jun 1, 2024
2 parents f2208b3 + 5cdec65 commit a94483a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/bootstrap/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,8 @@ impl Build {

// Make sure we update these before gathering metadata so we don't get an error about missing
// 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 {
build.update_submodule(Path::new(s));
}
Expand Down

0 comments on commit a94483a

Please sign in to comment.