about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJonas Schievink <jonasschievink@gmail.com>2020-09-25 19:42:37 +0200
committerGitHub <noreply@github.com>2020-09-25 19:42:37 +0200
commitb49990cede53f27b05f6c7c3a3d4091f972d2d4a (patch)
tree40a07e702bec15e476ff4bc3ceaef714e6973238 /src
parentba44e9fe3455ce2eab75e6c097a1e0180f54f9ba (diff)
parent9f27f3796d3487411ab035803a0757d69040649c (diff)
downloadrust-b49990cede53f27b05f6c7c3a3d4091f972d2d4a.tar.gz
rust-b49990cede53f27b05f6c7c3a3d4091f972d2d4a.zip
Rollup merge of #77086 - ehuss:src-libunwind, r=Mark-Simulacrum
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
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/dist.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index c119ae38fc3..f1202c82ba6 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -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.