Skip to content

Commit 6f9df29

Browse files
authored
Rollup merge of #116430 - onur-ozkan:vendoring-in-tarball-sources, r=clubby789
vendoring in tarball sources fixes #94782
2 parents 14663e0 + 92ab93f commit 6f9df29

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

Diff for: src/bootstrap/builder/tests.rs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ fn configure_with_args(cmd: &[String], host: &[&str], target: &[&str]) -> Config
2222
..Config::parse(&["check".to_owned()])
2323
});
2424
submodule_build.update_submodule(Path::new("src/doc/book"));
25-
submodule_build.update_submodule(Path::new("src/tools/rust-analyzer"));
2625
config.submodules = Some(false);
2726

2827
config.ninja_in_file = false;

Diff for: src/bootstrap/dist.rs

+9-5
Original file line numberDiff line numberDiff line change
@@ -1002,11 +1002,15 @@ impl Step for PlainSourceTarball {
10021002
channel::write_commit_info_file(&plain_dst_src, info);
10031003
}
10041004

1005-
// If we're building from git sources, we need to vendor a complete distribution.
1006-
if builder.rust_info().is_managed_git_subrepository() {
1007-
// Ensure we have the submodules checked out.
1008-
builder.update_submodule(Path::new("src/tools/cargo"));
1009-
builder.update_submodule(Path::new("src/tools/rust-analyzer"));
1005+
// If we're building from git or tarball sources, we need to vendor
1006+
// a complete distribution.
1007+
if builder.rust_info().is_managed_git_subrepository()
1008+
|| builder.rust_info().is_from_tarball()
1009+
{
1010+
if builder.rust_info().is_managed_git_subrepository() {
1011+
// Ensure we have the submodules checked out.
1012+
builder.update_submodule(Path::new("src/tools/cargo"));
1013+
}
10101014

10111015
// Vendor all Cargo dependencies
10121016
let mut cmd = Command::new(&builder.initial_cargo);

0 commit comments

Comments
 (0)