about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-06-01 16:48:46 +0000
committerbors <bors@rust-lang.org>2024-06-01 16:48:46 +0000
commita94483a5f2bae907bc898fc7a8d9cc87db47b693 (patch)
tree86e94683919b41a9fc39967cd418a73d20a9c9f0
parentf2208b32971faba7fa6bf09bd0821adbf3db0c00 (diff)
parent5cdec6582a6eab3b66b078cb858294792c096aa8 (diff)
downloadrust-a94483a5f2bae907bc898fc7a8d9cc87db47b693.tar.gz
rust-a94483a5f2bae907bc898fc7a8d9cc87db47b693.zip
Auto merge of #125856 - onur-ozkan:bootstrap-submodule-hotfix, r=onur-ozkan
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`
-rw-r--r--src/bootstrap/src/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
index 8312885915c..cde090637e0 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
@@ -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));
             }