Skip to content

Commit

Permalink
Rollup merge of #128685 - bjorn3:rust_src_remove_leftover, r=onur-ozkan
Browse files Browse the repository at this point in the history
Remove the root Cargo.lock from the rust-src component

The Cargo.lock in library/ should be used instead. Including the Cargo.lock for the root workspace is both unnecessary and confusing.

Missed in #128534
  • Loading branch information
matthiaskrgr authored Aug 6, 2024
2 parents 5f9ebb5 + e4e1b9b commit fb54b45
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/bootstrap/src/core/build_steps/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,6 @@ impl Step for Src {
// translation code in `imported_source_files` in `src/librustc_metadata/rmeta/decoder.rs`
let dst_src = tarball.image_dir().join("lib/rustlib/src/rust");

let src_files = ["Cargo.lock"];
// This is the reduced set of paths which will become the rust-src component
// (essentially libstd and all of its path dependencies).
copy_src_dirs(
Expand All @@ -937,9 +936,6 @@ impl Step for Src {
],
&dst_src,
);
for file in src_files.iter() {
builder.copy_link(&builder.src.join(file), &dst_src.join(file));
}

tarball.generate()
}
Expand Down

0 comments on commit fb54b45

Please sign in to comment.