about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2019-09-06 12:41:54 -0700
committerMatthew Maurer <mmaurer@google.com>2019-09-06 12:41:54 -0700
commita26ee8586c150e786ffaa47fba06ebcc671373d1 (patch)
treeba470998d7081b8ecc3c4d89960eb71331cbcb4e
parent4894123d21ed4b153a2e5c32c0870cb2d97f9b46 (diff)
downloadrust-a26ee8586c150e786ffaa47fba06ebcc671373d1.tar.gz
rust-a26ee8586c150e786ffaa47fba06ebcc671373d1.zip
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.rs1
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))