Skip to content

Commit 4b8b18f

Browse files
committed
resolve llvm-config path properly on cross builds
Signed-off-by: onur-ozkan <[email protected]>
1 parent 7daf4cf commit 4b8b18f

File tree

1 file changed

+8
-3
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+8
-3
lines changed

src/bootstrap/src/core/build_steps/llvm.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,14 @@ pub fn prebuilt_llvm_config(
120120
let root = "src/llvm-project/llvm";
121121
let out_dir = builder.llvm_out(target);
122122

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+
126131
let llvm_cmake_dir = out_dir.join("lib/cmake/llvm");
127132
let res = LlvmResult { llvm_config: build_llvm_config, llvm_cmake_dir };
128133

0 commit comments

Comments
 (0)