Include a copy of compiler-rt source in the download-ci-llvm tarball

This commit is contained in:
Zalathar 2024-08-15 14:55:40 +10:00
parent 13a52890dd
commit 320be47410
2 changed files with 14 additions and 1 deletions

View File

@ -1,4 +1,4 @@
Change this file to make users of the `download-ci-llvm` configuration download
a new version of LLVM from CI, even if the LLVM submodule hasnt changed.
Last change is for: https://github.com/rust-lang/rust/pull/125642
Last change is for: https://github.com/rust-lang/rust/pull/129116

View File

@ -2322,6 +2322,19 @@ impl Step for RustDev {
let link_type = if builder.llvm_link_shared() { "dynamic" } else { "static" };
t!(std::fs::write(tarball.image_dir().join("link-type.txt"), link_type), dst_libdir);
// Copy the `compiler-rt` source, so that `library/profiler_builtins`
// can potentially use it to build the profiler runtime without needing
// to check out the LLVM submodule.
copy_src_dirs(
builder,
&builder.src.join("src").join("llvm-project"),
&["compiler-rt"],
// The test subdirectory is much larger than the rest of the source,
// and we currently don't use these test files anyway.
&["compiler-rt/test"],
tarball.image_dir(),
);
Some(tarball.generate())
}
}