diff options
| author | bors <bors@rust-lang.org> | 2022-05-28 06:45:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-28 06:45:15 +0000 |
| commit | b97bfc3b38ad46fef419950d434d9a8e8f5c2d80 (patch) | |
| tree | 11ee97eb04ea5dbb0bf27ee5c5ed46f68db0f4cb /src | |
| parent | ed76b773b57cf0aa48ec4e2fc6d6a3f7a9079491 (diff) | |
| parent | 6f5de285eb093260a7a60664adc0683c86fa40d5 (diff) | |
| download | rust-b97bfc3b38ad46fef419950d434d9a8e8f5c2d80.tar.gz rust-b97bfc3b38ad46fef419950d434d9a8e8f5c2d80.zip | |
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 https://github.com/rust-lang/rust/issues/97464.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/dist.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index cc10d67c551..ae9fc1c527f 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -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") |