Skip to content

Commit

Permalink
Rollup merge of rust-lang#64240 - maurer:include-compiler-rt, r=alexc…
Browse files Browse the repository at this point in the history
…richton

Include compiler-rt in the source tarball

In rust-lang#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 rust-lang#64239
  • Loading branch information
Centril authored Sep 7, 2019
2 parents e6a7689 + a26ee85 commit e77ba6f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit e77ba6f

Please sign in to comment.