From 01e432a4450b8727800673c2912a0cedb11f3346 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@mozilla.com>
Date: Fri, 30 Jun 2017 14:57:29 -0700
Subject: [PATCH] Bug 1377137 - Repack upstream rust for mingw32 targets.
 r=mshal

Add a new tooltool package for x86_64-unknown-linux-gnu hosts
with the i686-pc-windows-msvc and i686-pc-windows-gnu standard
libraries for the benefit of the cross-mingw builds.

Add the mingw32 releng.manifest to the update list for
new tooltool packages.

MozReview-Commit-ID: KkYPfAojFU

--HG--
extra : rebase_source : 917f463517c5c222e883363438e1fa2ec0ffa6cf
---
 taskcluster/docker/rust-build/VERSION        | 2 +-
 taskcluster/docker/rust-build/repack_rust.py | 2 ++
 taskcluster/docker/rust-build/splat_rust.py  | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/taskcluster/docker/rust-build/VERSION b/taskcluster/docker/rust-build/VERSION
index ef52a648073d..f90568270955 100644
--- a/taskcluster/docker/rust-build/VERSION
+++ b/taskcluster/docker/rust-build/VERSION
@@ -1 +1 @@
-0.4.6
+0.4.7
diff --git a/taskcluster/docker/rust-build/repack_rust.py b/taskcluster/docker/rust-build/repack_rust.py
index 62d0e9a5d828..b32649a3d5d6 100644
--- a/taskcluster/docker/rust-build/repack_rust.py
+++ b/taskcluster/docker/rust-build/repack_rust.py
@@ -206,6 +206,7 @@ mac64 = "x86_64-apple-darwin"
 mac32 = "i686-apple-darwin"
 win64 = "x86_64-pc-windows-msvc"
 win32 = "i686-pc-windows-msvc"
+mingw32 = "i686-pc-windows-gnu"
 
 
 def args():
@@ -234,3 +235,4 @@ if __name__ == '__main__':
     repack(linux64, [linux64, mac64], suffix='mac-cross', **args)
     repack(linux64, [linux64, android, android_x86, android_aarch64],
            suffix='android-cross', **args)
+    repack(linux64, [linux64, win32, mingw32], suffix='mingw32-cross', **args)
diff --git a/taskcluster/docker/rust-build/splat_rust.py b/taskcluster/docker/rust-build/splat_rust.py
index f71aa9c244ad..baa79527edfb 100644
--- a/taskcluster/docker/rust-build/splat_rust.py
+++ b/taskcluster/docker/rust-build/splat_rust.py
@@ -72,6 +72,9 @@ TARGETS = {
             'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
             'mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest',
             ],
+        'x86_64-unknown-linux-gnu-mingw32-cross-repack': [
+            'browser/config/tooltool-manifests/mingw32/releng.manifest',
+            ],
         'x86_64-unknown-linux-gnu-mac-cross-repack': [
             'browser/config/tooltool-manifests/macosx64/cross-releng.manifest',
             ],