From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 15 Jul 2021 18:26:24 +0000 (+0100)
Subject: Hack broken rust target selection so it produces the right target on raspbian.
X-Git-Tag: archive/raspbian/78.13.0esr-1_deb10u1+rpi1~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=229c3f010a1b506eb99a5005b25397ec2520ef48;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 e5122d6b86e..af586523b48 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -192,9 +192,14 @@ def rust_compiler(rustc_info, cargo_info, build_project):
 
 
 @depends(rustc, when=rust_compiler)
+@imports('sys')
+@imports(_from='__builtin__', _import='repr')
 @imports(_from='__builtin__', _import='ValueError')
 def rust_supported_targets(rustc):
     out = check_cmd_output(rustc, '--print', 'target-list').splitlines()
+    #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.append('arm-unknown-linux-gnueabihf')
     data = {}
     for t in out:
         try:
@@ -232,11 +237,13 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler):
              rust_supported_targets, arm_target, when=rust_compiler)
     @checking('for rust %s triplet' % host_or_target_str)
     @imports('os')
+    @imports('sys')
     @imports(_from='mozbuild.configure.util', _import='LineIO')
     @imports(_from='mozbuild.shellutil', _import='quote')
     @imports(_from='six', _import='ensure_binary')
     @imports(_from='tempfile', _import='mkstemp')
     @imports(_from='textwrap', _import='dedent')
+    @imports(_from='__builtin__', _import='repr')
     def rust_target(rustc, host_or_target, compiler_info,
                     rust_supported_targets, arm_target):
         # Rust's --target options are similar to, but not exactly the same