diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2022-04-12 19:58:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-12 19:58:17 +0200 |
| commit | 911da62586071ec30aa1f5eb3643ef445f99dfca (patch) | |
| tree | a60fde5aa6c3299333946ca8d7b22538caed3dba | |
| parent | d6843448f158d83f48cd7126c7c8a35f973f0e6b (diff) | |
| parent | 03bcbbf9280efa27f6cc558b82edff5042b9b584 (diff) | |
| download | rust-911da62586071ec30aa1f5eb3643ef445f99dfca.tar.gz rust-911da62586071ec30aa1f5eb3643ef445f99dfca.zip | |
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.
| -rw-r--r-- | src/bootstrap/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index e4937d7bbcc..7b496e6c669 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -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") |