Checkout all submodules when building source tarballs

Kobzol · Kobzol · commit 63d6ce03b341 · 2024-03-31T12:56:05.000+02:00
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
@@ -995,9 +995,9 @@ impl Step for PlainSourceTarball {
         if builder.rust_info().is_managed_git_subrepository()
             || builder.rust_info().is_from_tarball()
         {
-            if builder.rust_info().is_managed_git_subrepository() {
-                // Ensure we have the submodules checked out.
-                builder.update_submodule(Path::new("src/tools/cargo"));
+            // Ensure we have all submodules from src and other directories checked out.
+            for submodule in builder.get_all_submodules() {
+                builder.update_submodule(Path::new(submodule));
             }
 
             // Vendor all Cargo dependencies

Original file line number	Diff line number	Diff line change
`@@ -995,9 +995,9 @@ impl Step for PlainSourceTarball {`
`995`	`995`	`if builder.rust_info().is_managed_git_subrepository()`
`996`	`996`	`\|\| builder.rust_info().is_from_tarball()`
`997`	`997`	`{`
`998`		`- if builder.rust_info().is_managed_git_subrepository() {`
`999`		`- // Ensure we have the submodules checked out.`
`1000`		`- builder.update_submodule(Path::new("src/tools/cargo"));`
	`998`	`+ // Ensure we have all submodules from src and other directories checked out.`
	`999`	`+ for submodule in builder.get_all_submodules() {`
	`1000`	`+ builder.update_submodule(Path::new(submodule));`
`1001`	`1001`	`}`
`1002`	`1002`
`1003`	`1003`	`// Vendor all Cargo dependencies`