Skip to content

Commit 6d7e6a2

Browse files
committed
vendor distribution on the tarball sources
Signed-off-by: onur-ozkan <[email protected]>
1 parent 2ffeb46 commit 6d7e6a2

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/bootstrap/dist.rs

+10-5
Original file line numberDiff line numberDiff line change
@@ -1001,11 +1001,16 @@ impl Step for PlainSourceTarball {
10011001
channel::write_commit_info_file(&plain_dst_src, info);
10021002
}
10031003

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

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

0 commit comments

Comments
 (0)