Skip to content

Commit

Permalink
Auto merge of #97465 - jyn514:dist-ra, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Fix `x dist --stage 1 src/tools/rust-analyzer`

Previously, this would break because the submodule wasn't checked out.

Fixes #97464.
  • Loading branch information
bors committed May 28, 2022
2 parents ed76b77 + 6f5de28 commit b97bfc3
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,9 @@ impl Step for PlainSourceTarball {

// If we're building from git sources, we need to vendor a complete distribution.
if builder.rust_info.is_git() {
// Ensure we have the submodules checked out.
builder.update_submodule(Path::new("src/tools/rust-analyzer"));

// Vendor all Cargo dependencies
let mut cmd = Command::new(&builder.initial_cargo);
cmd.arg("vendor")
Expand Down

0 comments on commit b97bfc3

Please sign in to comment.