Skip to content

Use a separate workspace for the library crates #76533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Use a separate workspace for the library crates #76533

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ffef99
Use a separate workspace for the sysroot
bjorn3 Sep 9, 2020
3bef430
Fix vendoring
bjorn3 Sep 10, 2020
30488fb
Fix tidy
bjorn3 Sep 10, 2020
2533d2f
Update src/bootstrap/dist.rs
bjorn3 Sep 10, 2020
054ca1c
Don't add unnecessary Cargo.lock to the rust-src component
bjorn3 Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/bootstrap/dist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,8 @@ impl Step for PlainSourceTarball {
// Vendor all Cargo dependencies
let mut cmd = Command::new(&builder.initial_cargo);
cmd.arg("vendor")
.arg("--sync")
.arg(builder.src.join("./library/Cargo.yoml"))
.arg("--sync")
.arg(builder.src.join("./src/tools/rust-analyzer/Cargo.toml"))
.current_dir(&plain_dst_src);
Expand Down