Skip to content

Commit

Permalink
Rollup merge of rust-lang#77086 - ehuss:src-libunwind, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Include libunwind in the rust-src component.

Some targets, such as musl, need the libunwind source to build the unwind crate (referenced [here](https://github.com/rust-lang/rust/blob/0da58007451a154da2480160429e1604a1f5f0ec/library/unwind/build.rs#L142)).

Fixes rust-lang/wg-cargo-std-aware#59
  • Loading branch information
RalfJung authored Sep 25, 2020
2 parents c822e91 + 9f27f37 commit 6e3b289
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ impl Step for Src {
copy_src_dirs(
builder,
&builder.src,
&["library"],
&["library", "src/llvm-project/libunwind"],
&[
// not needed and contains symlinks which rustup currently
// chokes on when unpacking.
Expand Down

0 comments on commit 6e3b289

Please sign in to comment.