mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vendor distribution on the tarball sources

Browse Source 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2023-10-04 22:38:29 +03:00
parent 2ffeb4636b
commit 6d7e6a25af
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/dist.rs
View File

@ -1001,11 +1001,16 @@ impl Step for PlainSourceTarball {
channel::write_commit_info_file(&plain_dst_src, info); channel::write_commit_info_file(&plain_dst_src, info);
} }
// If we're building from git sources, we need to vendor a complete distribution. // If we're building from git or tarball sources, we need to vendor
// a complete distribution.
if builder.rust_info().is_managed_git_subrepository()
|| builder.rust_info().is_from_tarball()
{
if builder.rust_info().is_managed_git_subrepository() { if builder.rust_info().is_managed_git_subrepository() {
// Ensure we have the submodules checked out. // Ensure we have the submodules checked out.
builder.update_submodule(Path::new("src/tools/cargo")); builder.update_submodule(Path::new("src/tools/cargo"));
builder.update_submodule(Path::new("src/tools/rust-analyzer")); builder.update_submodule(Path::new("src/tools/rust-analyzer"));
}
// Vendor all Cargo dependencies // Vendor all Cargo dependencies
let mut cmd = Command::new(&builder.initial_cargo); let mut cmd = Command::new(&builder.initial_cargo);