about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2023-05-05 12:46:27 +0900
committerGitHub <noreply@github.com>2023-05-05 12:46:27 +0900
commit5d85652684d386e29c8b6c6004fe9ac97d8609b6 (patch)
treee112b89acfde187727dea1685d8c3c487e14cfd0 /src
parent31e2f4d80029fdad78d0ac34a89696f50054e690 (diff)
parent025c60310a9eec1c866ec085ed52d7f981a39349 (diff)
downloadrust-5d85652684d386e29c8b6c6004fe9ac97d8609b6.tar.gz
rust-5d85652684d386e29c8b6c6004fe9ac97d8609b6.zip
Rollup merge of #111187 - krasimirgg:llvm-runtimes, r=jyn514
bootstrap: add llvm-project/runtimes to the sources

This is needed to build libunwind for LLVM 16:
https://discourse.llvm.org/t/runtimes-removed-support-for-llvm-enable-projects-in-libcxx-libcxxabi-and-libunwind/65707

Zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm/topic/missing.20llvm-project.2Fruntimes.20in.20beta.20srcs

Checked by running `x.py dist` and verifying the produced source archive (build/dist/rustc-1.71.0-dev-src.tar.gz) contains the new directory.
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/dist.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index ab7f7350d5f..9cead7adc8c 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -822,6 +822,8 @@ fn copy_src_dirs(
             "llvm-project\\compiler-rt",
             "llvm-project/cmake",
             "llvm-project\\cmake",
+            "llvm-project/runtimes",
+            "llvm-project\\runtimes",
         ];
         if spath.contains("llvm-project")
             && !spath.ends_with("llvm-project")