diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-07 08:06:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-07 08:06:14 +0200 |
| commit | e77ba6f9c442da8e4e8a8201fda0048e0462f3a8 (patch) | |
| tree | 39fbb3350655ec15dd860caf99b3b6af7938d9aa | |
| parent | e6a76891ef86d390ee23bd8f2f08c930f0a15d63 (diff) | |
| parent | a26ee8586c150e786ffaa47fba06ebcc671373d1 (diff) | |
| download | rust-e77ba6f9c442da8e4e8a8201fda0048e0462f3a8.tar.gz rust-e77ba6f9c442da8e4e8a8201fda0048e0462f3a8.zip | |
Rollup merge of #64240 - maurer:include-compiler-rt, r=alexcrichton
Include compiler-rt in the source tarball In #60981 we switched to using src/llvm-project/compiler-rt inside compiler-builtins rather than a separate copy of it. In order to have the "c" feature turn on in builds from the source tarball, we need to include that path in its creation. fixes #64239
| -rw-r--r-- | src/bootstrap/dist.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 0f4ac63651c..500d5766a89 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -808,6 +808,7 @@ fn copy_src_dirs(builder: &Builder<'_>, src_dirs: &[&str], exclude_dirs: &[&str] "llvm-project/lld", "llvm-project\\lld", "llvm-project/lldb", "llvm-project\\lldb", "llvm-project/llvm", "llvm-project\\llvm", + "llvm-project/compiler-rt", "llvm-project\\compiler-rt", ]; if spath.contains("llvm-project") && !spath.ends_with("llvm-project") && !LLVM_PROJECTS.iter().any(|path| spath.contains(path)) |