Bug 1384744 - Remove mozmake and rustc from the build-clang-cl tooltool manifest. r?gps draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 27 Jul 2017 08:09:34 +0900
changeset 616410 29bee60f5f9353454ad936b2be6aec3279cd1d63
parent 616409 a3ed9c77f8f6bc1d4e2a4d7aca914b75f3df264e
child 639456 5341887bb893ce21530233b3266a06920b070eb4
push id70668
push userbmo:mh+mozilla@glandium.org
push dateThu, 27 Jul 2017 00:37:52 +0000
reviewersgps
bugs1384744
milestone56.0a1
Bug 1384744 - Remove mozmake and rustc from the build-clang-cl tooltool manifest. r?gps The manifest is only used for windows clang-cl toolchain jobs, and building clang-cl doesn't use make or rustc.
browser/config/tooltool-manifests/win32/build-clang-cl.manifest
taskcluster/docker/rust-build/splat_rust.py
--- a/browser/config/tooltool-manifests/win32/build-clang-cl.manifest
+++ b/browser/config/tooltool-manifests/win32/build-clang-cl.manifest
@@ -1,24 +1,10 @@
 [
   {
-    "size": 266240,
-    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-    "algorithm": "sha512",
-    "filename": "mozmake.exe"
-  },
-  {
-    "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
-    "size": 97017057,
-    "digest": "b726645f9d26c5a3048720b3839166021c1cf91a02d2ff2f10c49adced7455c7352e18b5052084d80bf9d1c40ec1bf72d0397921b8cd23262f89fdbd10def58f",
-    "algorithm": "sha512",
-    "filename": "rustc.tar.bz2",
-    "unpack": true
-  },
-  {
     "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
     "size": 326656969,
     "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
     "algorithm": "sha512",
     "filename": "vs2015u3.zip",
     "unpack": true
   },
   {
--- a/taskcluster/docker/rust-build/splat_rust.py
+++ b/taskcluster/docker/rust-build/splat_rust.py
@@ -83,17 +83,16 @@ TARGETS = {
             'browser/config/tooltool-manifests/macosx64/clang.manifest',
             'browser/config/tooltool-manifests/macosx64/releng.manifest',
             ],
         'x86_64-pc-windows-msvc-repack': [
             'browser/config/tooltool-manifests/win64/clang.manifest',
             'browser/config/tooltool-manifests/win64/releng.manifest',
             ],
         'i686-pc-windows-msvc-repack': [
-            'browser/config/tooltool-manifests/win32/build-clang-cl.manifest',
             'browser/config/tooltool-manifests/win32/clang.manifest',
             'browser/config/tooltool-manifests/win32/releng.manifest',
             ],
 }
 
 if __name__ == '__main__':
     if len(sys.argv) < 2:
         print('%s PATH' % sys.argv[0])