Hack broken rust target selection so it produces the right target on raspbian.
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 17 Nov 2022 10:01:08 +0000 (10:01 +0000)
committerRaspbian forward porter <root@raspbian.org>
Thu, 17 Nov 2022 10:01:08 +0000 (10:01 +0000)
Gbp-Pq: Name raspbian-rust-triplet-hack.patch

build/moz.configure/rust.configure

index 10c8947bc071ee8bd6a7eca1ab83b23191dc0eb4..10864af5ed3ca81ee73a227a465f4b013e598407 100644 (file)
@@ -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: