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 8dbbace1783502b725f12958f5bfa5bf5213bf3e..07308cb6cd3dcd4519f099ea92f69aeecb9af1a0 100644 (file)
--- 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 c406672d9b6b700b7285f3ab0dc133b7869768b5..83a2fe99facfe185d36b5f9e58c95f8aef8dc3ff 100644 (file)
--- 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: