Auto merge of #138623 - daltenty:daltenty/fix-compiler-rt, r= · rust-lang/rust@9f6d358 (original) (raw)
File tree
1 file changed
lines changed
- src/bootstrap/src/core/build_steps
1 file changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -479,7 +479,6 @@ impl Step for Llvm { | ||
| 479 | 479 | |
| 480 | 480 | if helpers::forcing_clang_based_tests() { |
| 481 | 481 | enabled_llvm_projects.push("clang"); |
| 482 | - enabled_llvm_projects.push("compiler-rt"); | |
| 483 | 482 | } |
| 484 | 483 | |
| 485 | 484 | if builder.config.llvm_polly { |
| @@ -502,6 +501,10 @@ impl Step for Llvm { | ||
| 502 | 501 | |
| 503 | 502 | let mut enabled_llvm_runtimes = Vec::new(); |
| 504 | 503 | |
| 504 | +if helpers::forcing_clang_based_tests() { | |
| 505 | + enabled_llvm_runtimes.push("compiler-rt"); | |
| 506 | +} | |
| 507 | + | |
| 505 | 508 | if builder.config.llvm_offload { |
| 506 | 509 | enabled_llvm_runtimes.push("offload"); |
| 507 | 510 | //FIXME(ZuseZ4): LLVM intends to drop the offload dependency on openmp. |