File tree Expand file tree Collapse file tree 1 file changed +11
-1
lines changed
src/bootstrap/src/core/config Expand file tree Collapse file tree 1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -1278,7 +1278,8 @@ impl Config {
12781278
12791279 if config. llvm_from_ci {
12801280 let triple = & config. host_target . triple ;
1281- let ci_llvm_bin = config. ci_llvm_root ( ) . join ( "bin" ) ;
1281+ let ci_llvm_bin =
1282+ ci_llvm_root ( config. llvm_from_ci , & config. out , & config. host_target ) . join ( "bin" ) ;
12821283 let build_target = config
12831284 . target_config
12841285 . entry ( config. host_target )
@@ -2736,3 +2737,12 @@ pub fn is_system_llvm(
27362737pub fn is_host_target ( host_target : & TargetSelection , target : & TargetSelection ) -> bool {
27372738 host_target == target
27382739}
2740+
2741+ pub ( crate ) fn ci_llvm_root (
2742+ llvm_from_ci : bool ,
2743+ out : & Path ,
2744+ host_target : & TargetSelection ,
2745+ ) -> PathBuf {
2746+ assert ! ( llvm_from_ci) ;
2747+ out. join ( host_target) . join ( "ci-llvm" )
2748+ }
You can’t perform that action at this time.
0 commit comments