File tree 1 file changed +8
-3
lines changed
src/bootstrap/src/core/build_steps
1 file changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -120,9 +120,14 @@ pub fn prebuilt_llvm_config(
120
120
let root = "src/llvm-project/llvm" ;
121
121
let out_dir = builder. llvm_out ( target) ;
122
122
123
- let mut llvm_config_ret_dir = builder. llvm_out ( builder. config . build ) ;
124
- llvm_config_ret_dir. push ( "bin" ) ;
125
- let build_llvm_config = llvm_config_ret_dir. join ( exe ( "llvm-config" , builder. config . build ) ) ;
123
+ let build_llvm_config = if target == builder. config . build {
124
+ let mut llvm_config_ret_dir = builder. llvm_out ( builder. config . build ) ;
125
+ llvm_config_ret_dir. push ( "bin" ) ;
126
+ llvm_config_ret_dir. join ( exe ( "llvm-config" , builder. config . build ) )
127
+ } else {
128
+ builder. ensure ( Llvm { target : builder. config . build } ) . llvm_config
129
+ } ;
130
+
126
131
let llvm_cmake_dir = out_dir. join ( "lib/cmake/llvm" ) ;
127
132
let res = LlvmResult { llvm_config : build_llvm_config, llvm_cmake_dir } ;
128
133
You can’t perform that action at this time.
0 commit comments