Skip to content

Commit

Permalink
Rollup merge of rust-lang#81997 - bnjbvr:dist-include-build-helper, r…
Browse files Browse the repository at this point in the history
…=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: rust-lang/rust-analyzer#7589.
  • Loading branch information
JohnTitor authored Feb 12, 2021
2 parents 2a83fdf + f492b25 commit 758adcd
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 758adcd

Please sign in to comment.