Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d0bc35d

Browse files
authoredMar 21, 2025
Unrolled build for rust-lang#138623
Rollup merge of rust-lang#138623 - daltenty:daltenty/fix-compiler-rt, r=Kobzol [bootstrap] Use llvm_runtimes for compiler-rt Trying to enable `compiler-rt` via `LLVM_ENABLE_PROJECTS` is no longer a supported option in LLVM, and gives you nasty warnings: ``` Using LLVM_ENABLE_PROJECTS=compiler-rt is deprecated now, and will become a fatal error in the LLVM 21 release. Please use -DLLVM_ENABLE_RUNTIMES=compiler-rt or see the instructions at https://compiler-rt.llvm.org/ for building the runtimes. ``` try-job: aarch64-gnu-debug try-job: x86_64-gnu-debug
2 parents a4a11ac + b77590c commit d0bc35d

File tree

1 file changed

+4
-1
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+4
-1
lines changed
 

‎src/bootstrap/src/core/build_steps/llvm.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,6 @@ impl Step for Llvm {
444444

445445
if helpers::forcing_clang_based_tests() {
446446
enabled_llvm_projects.push("clang");
447-
enabled_llvm_projects.push("compiler-rt");
448447
}
449448

450449
if builder.config.llvm_polly {
@@ -467,6 +466,10 @@ impl Step for Llvm {
467466

468467
let mut enabled_llvm_runtimes = Vec::new();
469468

469+
if helpers::forcing_clang_based_tests() {
470+
enabled_llvm_runtimes.push("compiler-rt");
471+
}
472+
470473
if builder.config.llvm_offload {
471474
enabled_llvm_runtimes.push("offload");
472475
//FIXME(ZuseZ4): LLVM intends to drop the offload dependency on openmp.

0 commit comments

Comments
 (0)
Failed to load comments.