Skip to content

Commit 9f6d358

Browse files
committed
Auto merge of rust-lang#138623 - daltenty:daltenty/fix-compiler-rt, r=<try>
[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 493c38b + b77590c commit 9f6d358

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
@@ -479,7 +479,6 @@ impl Step for Llvm {
479479

480480
if helpers::forcing_clang_based_tests() {
481481
enabled_llvm_projects.push("clang");
482-
enabled_llvm_projects.push("compiler-rt");
483482
}
484483

485484
if builder.config.llvm_polly {
@@ -502,6 +501,10 @@ impl Step for Llvm {
502501

503502
let mut enabled_llvm_runtimes = Vec::new();
504503

504+
if helpers::forcing_clang_based_tests() {
505+
enabled_llvm_runtimes.push("compiler-rt");
506+
}
507+
505508
if builder.config.llvm_offload {
506509
enabled_llvm_runtimes.push("offload");
507510
//FIXME(ZuseZ4): LLVM intends to drop the offload dependency on openmp.

0 commit comments

Comments
 (0)