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

luqmana · luqmana · commit 03bcbbf9280e · 2022-04-11T21:32:45.000-04:00
diff --git 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")

Original file line number	Diff line number	Diff line change
`@@ -865,8 +865,8 @@ impl Build {`
`865`	`865`	`}`
`866`	`866`	`}`
`867`	`867`	`} 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") {`
`870`	`870`	`if self.config.llvm_optimize {`
`871`	`871`	`if self.config.llvm_release_debuginfo {`
`872`	`872`	`base.join("RelWithDebInfo")`