Skip to content

Commit 911da62

Browse files
authored
Rollup merge of #95963 - luqmana:llvm-dist-cross-filecheck, r=Mark-Simulacrum
[bootstrap] Grab the right FileCheck binary for dist when cross-compiling. Fixes #95862 We were using the target dir for all the other LLVM tools (`llvm-config`, `llvm-ar`, etc) but the build target dir for `FileCheck`. This meant for targets which are cross-compiled, we were copying the wrong binary.
2 parents d684344 + 03bcbbf commit 911da62

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/bootstrap/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,8 @@ impl Build {
865865
}
866866
}
867867
} else {
868-
let base = self.llvm_out(self.config.build).join("build");
869-
let base = if !self.ninja() && self.config.build.contains("msvc") {
868+
let base = self.llvm_out(target).join("build");
869+
let base = if !self.ninja() && target.contains("msvc") {
870870
if self.config.llvm_optimize {
871871
if self.config.llvm_release_debuginfo {
872872
base.join("RelWithDebInfo")

0 commit comments

Comments
 (0)