Skip to content

Commit b97bfc3

Browse files
committed
Auto merge of #97465 - jyn514:dist-ra, r=Mark-Simulacrum
Fix `x dist --stage 1 src/tools/rust-analyzer` Previously, this would break because the submodule wasn't checked out. Fixes #97464.
2 parents ed76b77 + 6f5de28 commit b97bfc3

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/bootstrap/dist.rs

+3
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,9 @@ impl Step for PlainSourceTarball {
879879

880880
// If we're building from git sources, we need to vendor a complete distribution.
881881
if builder.rust_info.is_git() {
882+
// Ensure we have the submodules checked out.
883+
builder.update_submodule(Path::new("src/tools/rust-analyzer"));
884+
882885
// Vendor all Cargo dependencies
883886
let mut cmd = Command::new(&builder.initial_cargo);
884887
cmd.arg("vendor")

0 commit comments

Comments
 (0)