about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorBenjamin Bouvier <public@benj.me>2021-02-11 17:45:54 +0100
committerBenjamin Bouvier <public@benj.me>2021-02-11 17:45:54 +0100
commitf492b257e79b44b8544ca1d05b79435c01b9f422 (patch)
tree79ed469a298f881b8832a804bfb7f2e9f21513f6 /src/bootstrap
parent2918062d1d94b65dfd53d265e957d86fcb8bfdbd (diff)
downloadrust-f492b257e79b44b8544ca1d05b79435c01b9f422.tar.gz
rust-f492b257e79b44b8544ca1d05b79435c01b9f422.zip
dist: include src/build_helper as part of the crate graph for rustc-dev.
Since it was missing, it wasn't possible to really use rustc-dev to
build, see for instance: https://github.com/rust-analyzer/rust-analyzer/issues/7589.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/dist.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index af9c0fb04bc..3ebfdb24879 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -645,6 +645,14 @@ impl Step for RustcDev {
             &[],
             &tarball.image_dir().join("lib/rustlib/rustc-src/rust"),
         );
+        // This particular crate is used as a build dependency of the above.
+        copy_src_dirs(
+            builder,
+            &builder.src,
+            &["src/build_helper"],
+            &[],
+            &tarball.image_dir().join("lib/rustlib/rustc-src/rust"),
+        );
         for file in src_files {
             tarball.add_file(builder.src.join(file), "lib/rustlib/rustc-src/rust", 0o644);
         }