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 4433ea3

Browse files
authoredJun 14, 2024
Unrolled build for rust-lang#126399
Rollup merge of rust-lang#126399 - onur-ozkan:126156, r=albertlarsan68 extend the check for LLVM build We don't build LLVM when using the precompiled version from the CI builder. Closes rust-lang#126156
2 parents 63491e1 + 58e3ac0 commit 4433ea3

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed
 

‎src/bootstrap/src/core/sanity.rs

+14-13
Original file line numberDiff line numberDiff line change
@@ -137,19 +137,20 @@ pub fn check(build: &mut Build) {
137137
}
138138

139139
// We need cmake, but only if we're actually building LLVM or sanitizers.
140-
let building_llvm = build
141-
.hosts
142-
.iter()
143-
.map(|host| {
144-
build.config.llvm_enabled(*host)
145-
&& build
146-
.config
147-
.target_config
148-
.get(host)
149-
.map(|config| config.llvm_config.is_none())
150-
.unwrap_or(true)
151-
})
152-
.any(|build_llvm_ourselves| build_llvm_ourselves);
140+
let building_llvm = !build.config.llvm_from_ci
141+
&& build
142+
.hosts
143+
.iter()
144+
.map(|host| {
145+
build.config.llvm_enabled(*host)
146+
&& build
147+
.config
148+
.target_config
149+
.get(host)
150+
.map(|config| config.llvm_config.is_none())
151+
.unwrap_or(true)
152+
})
153+
.any(|build_llvm_ourselves| build_llvm_ourselves);
153154

154155
let need_cmake = building_llvm || build.config.any_sanitizers_to_build();
155156
if need_cmake && cmd_finder.maybe_have("cmake").is_none() {

0 commit comments

Comments
 (0)
Failed to load comments.