From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 9 Dec 2021 21:25:54 +0000 (+0000)
Subject: Fix a typo (lines in wrong order) made when merging rust-configure.
X-Git-Tag: archive/raspbian/1%91.3.2-1+rpi1~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9df8bc56eff6949c8ef7fb7b7ccefac3ee9bb838;p=thunderbird.git

Fix a typo (lines in wrong order) made when merging rust-configure.
---

diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
index 8dbbace178..07308cb6cd 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -242,8 +242,8 @@ def rust_compiler(rustc_info, cargo_info):
 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.append("arm-unknown-linux-gnueabihf")
     out = check_cmd_output(rustc, "--print", "target-list").splitlines()
+    out.append("arm-unknown-linux-gnueabihf")
     data = {}
     for t in out:
         try:
diff --git a/debian/patches/raspbian-rust-triplet-hack.patch b/debian/patches/raspbian-rust-triplet-hack.patch
index c406672d9b..83a2fe99fa 100644
--- a/debian/patches/raspbian-rust-triplet-hack.patch
+++ b/debian/patches/raspbian-rust-triplet-hack.patch
@@ -1,10 +1,10 @@
 Description:  Hack broken rust target selection so it produces the right target on raspbian.
 Author: Peter Michael Green <plugwash@raspbian.org>
 diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
-index 40f017da67..8dbbace178 100644
+index 40f017da67..07308cb6cd 100644
 --- a/build/moz.configure/rust.configure
 +++ b/build/moz.configure/rust.configure
-@@ -236,8 +236,13 @@ def rust_compiler(rustc_info, cargo_info):
+@@ -236,9 +236,14 @@ def rust_compiler(rustc_info, cargo_info):
  
  
  @depends(rustc, when=rust_compiler)
@@ -14,7 +14,8 @@ index 40f017da67..8dbbace178 100644
  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.append("arm-unknown-linux-gnueabihf")
      out = check_cmd_output(rustc, "--print", "target-list").splitlines()
++    out.append("arm-unknown-linux-gnueabihf")
      data = {}
      for t in out:
+         try: