bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #138623 - daltenty:daltenty/fix-compiler-rt, r=Kobzol

Browse source 
[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
This commit is contained in:
Matthias Krüger 2025-03-21 15:48:53 +01:00 • committed by GitHub
commit a8f0c6bbcb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/src/core/build_steps/llvm.rs
View file

@ -479,7 +479,6 @@ impl Step for Llvm {
if helpers::forcing_clang_based_tests() { if helpers::forcing_clang_based_tests() {
enabled_llvm_projects.push("clang"); enabled_llvm_projects.push("clang");
enabled_llvm_projects.push("compiler-rt");
} }
if builder.config.llvm_polly { if builder.config.llvm_polly {
@ -502,6 +501,10 @@ impl Step for Llvm {
let mut enabled_llvm_runtimes = Vec::new(); let mut enabled_llvm_runtimes = Vec::new();
if helpers::forcing_clang_based_tests() {
enabled_llvm_runtimes.push("compiler-rt");
}
if builder.config.llvm_offload { if builder.config.llvm_offload {
enabled_llvm_runtimes.push("offload"); enabled_llvm_runtimes.push("offload");
//FIXME(ZuseZ4): LLVM intends to drop the offload dependency on openmp. //FIXME(ZuseZ4): LLVM intends to drop the offload dependency on openmp.