about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-08-06 20:23:40 +0200
committerGitHub <noreply@github.com>2024-08-06 20:23:40 +0200
commitfb54b45c3f2b59621736ff40e8673a40c7520f6b (patch)
tree2590f4c66fd6745ab74986eb70c9b71b2aed3225
parent5f9ebb5d2632d6a00d2f64a089d27e2d9484dc2c (diff)
parente4e1b9b805252c3c6f6053b595e26e3414cd54d4 (diff)
downloadrust-fb54b45c3f2b59621736ff40e8673a40c7520f6b.tar.gz
rust-fb54b45c3f2b59621736ff40e8673a40c7520f6b.zip
Rollup merge of #128685 - bjorn3:rust_src_remove_leftover, r=onur-ozkan
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 https://github.com/rust-lang/rust/pull/128534
-rw-r--r--src/bootstrap/src/core/build_steps/dist.rs4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index c14709ffb63..43306eab1b1 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -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(
@@ -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()
     }