From: Peter Michael Green <plugwash@raspbian.org>
Date: Fri, 28 Jul 2023 01:09:12 +0000 (+0100)
Subject: Hack broken rust target selection so it produces the right target on raspbian.
X-Git-Tag: archive/raspbian/102.14.0esr-1_deb10u1+rpi1~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=84ccaec8449d61d5053e0d4cc0ca287afd75760b;p=firefox-esr.git

Hack broken rust target selection so it produces the right target on raspbian.


Gbp-Pq: Name raspbian-rust-triplet-hack.patch
---

diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
index 10c8947bc07..10864af5ed3 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -249,9 +249,14 @@ def rust_compiler(rustc_info, cargo_info, target):
 
 
 @depends(rustc, when=rust_compiler)
+@imports("sys")
+@imports(_from="__builtin__", _import='repr')
 @imports(_from="__builtin__", _import="ValueError")
 def rust_supported_targets(rustc):
+    #HACK: if there are multiple matches the algorithm uses the last one
+    #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered
     out = check_cmd_output(rustc, "--print", "target-list").splitlines()
+    out.append("arm-unknown-linux-gnueabihf")
     data = {}
     for t in out:
         try: