File tree Expand file tree Collapse file tree 1 file changed +14
-13
lines changed Expand file tree Collapse file tree 1 file changed +14
-13
lines changed Original file line number Diff line number Diff line change @@ -138,19 +138,20 @@ pub fn check(build: &mut Build) {
138138 }
139139
140140 // We need cmake, but only if we're actually building LLVM or sanitizers.
141- let building_llvm = 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) ;
141+ let building_llvm = !build. config . llvm_from_ci
142+ && build
143+ . hosts
144+ . iter ( )
145+ . map ( |host| {
146+ build. config . llvm_enabled ( * host)
147+ && build
148+ . config
149+ . target_config
150+ . get ( host)
151+ . map ( |config| config. llvm_config . is_none ( ) )
152+ . unwrap_or ( true )
153+ } )
154+ . any ( |build_llvm_ourselves| build_llvm_ourselves) ;
154155
155156 let need_cmake = building_llvm || build. config . any_sanitizers_to_build ( ) ;
156157 if need_cmake && cmd_finder. maybe_have ( "cmake" ) . is_none ( ) {
You can’t perform that action at this time.
0 commit comments