Skip to content

Commit

Permalink
Rollup merge of rust-lang#95963 - luqmana:llvm-dist-cross-filecheck, …
Browse files Browse the repository at this point in the history
…r=Mark-Simulacrum

[bootstrap] Grab the right FileCheck binary for dist when cross-compiling.

Fixes rust-lang#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.
  • Loading branch information
m-ou-se authored Apr 12, 2022
2 parents d684344 + 03bcbbf commit 911da62
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/bootstrap/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -865,8 +865,8 @@ impl Build {
}
}
} else {
let base = self.llvm_out(self.config.build).join("build");
let base = if !self.ninja() && self.config.build.contains("msvc") {
let base = self.llvm_out(target).join("build");
let base = if !self.ninja() && target.contains("msvc") {
if self.config.llvm_optimize {
if self.config.llvm_release_debuginfo {
base.join("RelWithDebInfo")
Expand Down

0 comments on commit 911da62

Please sign in to comment.