0004-Force-the-target-when-building-for-CompileKind-Host.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Greaves <david.greaves@jolla.com>
Date: Mon, 30 Nov 2020 13:07:39 +0000
Subject: [PATCH] Force the target when building for CompileKind::Host

Currently hardwired to be i686-unknown-linux-gnu

Signed-off-by: David Greaves <david.greaves@jolla.com>
Signed-off-by: Ruben De Smet <ruben.de.smet@rubdos.be>
---
 src/tools/cargo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/cargo/src/cargo/core/compiler/mod.rs b/src/tools/cargo/src/cargo/core/compiler/mod.rs
index 7024a2ac5..ebce975a9 100644
--- a/src/tools/cargo/src/cargo/core/compiler/mod.rs
+++ b/src/tools/cargo/src/cargo/core/compiler/mod.rs
@@ -1111,6 +1111,9 @@ fn build_base_args(cx: &Context<'_, '_>, cmd: &mut ProcessBuilder, unit: &Unit)
 
     if let CompileKind::Target(n) = unit.kind {
         cmd.arg("--target").arg(n.rustc_target());
+    } else {
+        debug!("kind is {:?} - Forcing this to be 686", unit.kind);
+        cmd.arg("--target").arg("i686-unknown-linux-gnu");
     }
 
     opt(
-- 
2.42.0