nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #95963 - luqmana:llvm-dist-cross-filecheck, r=Mark-Simulacrum

Browse Source 
[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.
This commit is contained in:
Mara Bos 2022-04-12 19:58:17 +02:00 committed by GitHub
commit 911da62586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/lib.rs
View File

@ -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")