diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2021-02-12 19:32:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 19:32:16 +0900 |
| commit | 71fd43117bd4a7743195d596d73b96551d8b2239 (patch) | |
| tree | a02040bbada989e070a252e7305641d3271d8d66 | |
| parent | 44d28717da25fc1913431939a78fb1b3529e2ace (diff) | |
| parent | f492b257e79b44b8544ca1d05b79435c01b9f422 (diff) | |
| download | rust-71fd43117bd4a7743195d596d73b96551d8b2239.tar.gz rust-71fd43117bd4a7743195d596d73b96551d8b2239.zip | |
Rollup merge of #81997 - bnjbvr:dist-include-build-helper, r=Mark-Simulacrum
dist: include src/build_helper as part of the crate graph for rustc-dev The build_helper dependency is used to build the compiler/rustc_llvm build script. 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.
| -rw-r--r-- | src/bootstrap/dist.rs | 8 |
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); } |