Merge pull request #14 from rubdos/sb2-cargo-target

Let Cargo obey the SB2_TARGET variable

Author: Tomin1

0007-Scratchbox2-needs-to-be-able-to-tell-cargo-the-defau.patch

@@ -0,0 +1,35 @@
+From f5d252ef690390c2cb9948995ccf68aeae2b123e Mon Sep 17 00:00:00 2001
+From: Ruben De Smet <ruben.de.smet@rubdos.be>
+Date: Thu, 27 Jan 2022 16:32:39 +0100
+Subject: [PATCH] Scratchbox2 needs to be able to tell cargo the default
+ target.
+
+This is analogous to the SB2 patch to rustc; ac226bbc018e11311394126fe580763c5bc77a2c
+
+Signed-off-by: Ruben De Smet <ruben.de.smet@rubdos.be>
+---
+ src/cargo/core/compiler/compile_kind.rs | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/tools/cargo/src/cargo/core/compiler/compile_kind.rs b/src/tools/cargo/src/cargo/core/compiler/compile_kind.rs
+index adfa55f..8d892a0 100644
+--- a/src/tools/cargo/src/cargo/core/compiler/compile_kind.rs
++++ b/src/tools/cargo/src/cargo/core/compiler/compile_kind.rs
+@@ -76,7 +76,13 @@ impl CompileKind {
+                 };
+                 CompileKind::Target(CompileTarget::new(&value)?)
+             }
+-            None => CompileKind::Host,
++            None => {
++                if let Ok(sb2_tgt) = std::env::var("SB2_RUST_TARGET_TRIPLE") {
++                    CompileKind::Target(CompileTarget::new(&sb2_tgt)?)
++                } else {
++                    CompileKind::Host
++                }
++            }
+         };
+         Ok(vec![kind])
+     }
+-- 
+2.31.1
+

rust.spec

@@ -62,6 +62,7 @@ Patch3: 0003-Disable-statx-for-all-builds.-JB-50106.patch
 Patch4: 0004-Scratchbox2-needs-to-be-able-to-tell-rustc-the-defau.patch
 Patch5: 0005-Cargo-Force-the-target-when-building-for-CompileKind-Host.patch
 Patch6: 0006-Provide-ENV-controls-to-bypass-some-sb2-calls-betwee.patch
+Patch7: 0007-Scratchbox2-needs-to-be-able-to-tell-cargo-the-defau.patch
 # This is the real rustc spec - the stub one appears near the end.
 %ifarch %ix86