Keep tooltool manifests and build files in sync (port bug 1356932, 1356929, 1356927). rs=bustage-fix
authorJorg K
Wed, 19 Apr 2017 11:32:23 +0200
changeset 21430 b80b9e6d0f2237d00a9913ba5936ec8141524a9d
parent 21429 5e4e889f13eb1fd5091f60921a1566c661f2c630
child 21431 59a57fca8ba85575c7e3e9a583b111e254717c76
push id13044
push usermozilla@jorgk.com
push dateWed, 19 Apr 2017 09:32:44 +0000
treeherdercomm-central@b80b9e6d0f22 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1356932, 1356929, 1356927
Keep tooltool manifests and build files in sync (port bug 1356932, 1356929, 1356927). rs=bustage-fix
build/macosx/local-mozconfig.common
mail/config/tooltool-manifests/linux64/releng.manifest
mail/config/tooltool-manifests/macosx64/clang.manifest
mail/config/tooltool-manifests/macosx64/releng.manifest
--- a/build/macosx/local-mozconfig.common
+++ b/build/macosx/local-mozconfig.common
@@ -12,24 +12,28 @@ fi
 if [ -d "$topsrcdir/clang" ]; then
     # mozilla-central based build
     export CC=$topsrcdir/clang/bin/clang
     export CXX=$topsrcdir/clang/bin/clang++
     export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
     export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
     # Use an updated linker.
     ldflags="-B$topsrcdir/cctools/bin"
+    export AR=$topsrcdir/cctools/bin/ar
+    export RANLIB=$topsrcdir/cctools/bin/ranlib
 elif [ -d "$topsrcdir/../clang" ]; then
     # comm-central based build
     export CC=$topsrcdir/../clang/bin/clang
     export CXX=$topsrcdir/../clang/bin/clang++
     export LLVMCONFIG=$topsrcdir/../clang/bin/llvm-config
     export DSYMUTIL=$topsrcdir/../clang/bin/llvm-dsymutil
     # Use an updated linker.
     ldflags="-B$topsrcdir/../cctools/bin"
+    export AR=$topsrcdir/../cctools/bin/ar
+    export RANLIB=$topsrcdir/../cctools/bin/ranlib
 fi
 
 # Ensure the updated linker doesn't generate things our older build tools
 # don't understand.
 ldflags="$ldflags -Wl,-no_data_in_code_info"
 export LDFLAGS="$ldflags"
 
 # Until bug 1342503 is fixed, we can't build some of the webrender dependencies
--- a/mail/config/tooltool-manifests/linux64/releng.manifest
+++ b/mail/config/tooltool-manifests/linux64/releng.manifest
@@ -29,15 +29,15 @@
     "visibility": "public",
     "filename": "sccache2.tar.xz",
     "unpack": true,
     "digest": "770bec21b71c386a5a89c9dede3b5dfbf47f7b22d395d5e4642d9c309a44fa05bf4a3a7b6d48b0bc737eafe3e3a8ce90005dcbad51a1aba4d326d5216b29dca1",
     "size": 2173064
   },
   {
     "version": "clang + llvm 3.9.0, built from SVN r290136",
-    "size": 168062128,
-    "digest": "2a5458a25792fcade86a56ff0f4acdfa284d2b62966991a7c34a92c2e8c0b4a162ce00512d4467754e7f74598d64c56e91517e1606ed3fba011f7c10e8ad3288",
+    "size": 166261192,
+    "digest": "52f3fc23f0f5c98050f8b0ac7c92a6752d067582a16f712a5a58074be98975d594f9e36249fc2be7f1cc2ca6d509c663faaf2bea66f949243cc1f41651638ba6",
     "algorithm": "sha512",
     "filename": "clang.tar.xz",
     "unpack": true
   }
 ]
--- a/mail/config/tooltool-manifests/macosx64/clang.manifest
+++ b/mail/config/tooltool-manifests/macosx64/clang.manifest
@@ -20,16 +20,16 @@
     "algorithm": "sha512",
     "visibility": "public",
     "filename": "sccache2.tar.bz2",
     "unpack": true,
     "digest": "6c93ee3ef4bcc129ade3e58629ba4be224a1dec5e1d864ba4017d1bc2a17febb0ca32e4e6d2575c8cc6e0a8235ca07be485b8c6c1cf1a0c0e91e3c23caa515b8",
     "size": 1603430
   },
   {
-    "version": "cctools port from commit hash 84ce22dbb22a26ce7f392e9de0ee39c2efe6fd68",
-    "size": 2174783,
-    "digest": "8678348faff8f344b377075007975ae77a55a2a73488e36950a43c8ec27a79970cd8e34003e33e756a57d9cbf5c3e2e4461184102c6c03f793377a4d250a7f24",
+    "version": "cctools port from commit hash 8e9c3f2506b51",
+    "size": 2233376,
+    "digest": "d632ef587f0253f016aa5323999a3d9576284c04e66b5243a5780af9a55f474ac91ad8dee5bd86a6ee4e2593e2b345e2fd0aa4e8838b3686f84c5c5ac5c9c418",
     "algorithm": "sha512",
     "filename": "cctools.tar.bz2",
     "unpack": true
   }
 ]
--- a/mail/config/tooltool-manifests/macosx64/releng.manifest
+++ b/mail/config/tooltool-manifests/macosx64/releng.manifest
@@ -1,29 +1,29 @@
 [
   {
-    "version": "clang 3.8.0",
-    "size": 133060926,
-    "digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
+    "version": "clang 3.9.0",
+    "size": 184678304,
+    "digest": "cfde9a0f7f59823200f94422b4adb9a2fb5d4d07f240bbd1142c792434f6a1cbb4096d25c9853d77008fc40db0d827daa7003e78016f51241f621d6040ccc635",
     "algorithm": "sha512",
     "filename": "clang.tar.bz2",
     "unpack": true
   },
   {
     "version": "rustc 1.16.0 (30cf806ef 2017-03-10) repack",
     "size": 124444249,
     "digest": "11239565e6dde851a5229a0380da129b129c560c3fa765eb4998549e688385be314523074456afec9ebe4ddb6af71e44c64d7c669e7e904ed253f6e7b0f6317b",
     "algorithm": "sha512",
     "filename": "rustc.tar.bz2",
     "unpack": true
   },
   {
-    "version": "cctools port from commit hash db1f8d906cb28, ld only",
-    "size": 634496,
-    "digest": "037f31fcf29e7bb7fada0d2bdd5e95c7d4cb2692f2a5c98ed6f6a7561b9d81622d015f0d12b291d3667719655f1369e8ce8a0a4a4773aa0ee4753e04a8821173",
+    "version": "cctools port from commit hash 8e9c3f2506b51",
+    "size": 2233376,
+    "digest": "d632ef587f0253f016aa5323999a3d9576284c04e66b5243a5780af9a55f474ac91ad8dee5bd86a6ee4e2593e2b345e2fd0aa4e8838b3686f84c5c5ac5c9c418",
     "algorithm": "sha512",
     "filename": "cctools.tar.bz2",
     "unpack": true
   },
   {
     "version": "sccache rev 7a3847276d05deb564cb84a16b8c551b690aaa3e",
     "algorithm": "sha512",
     "visibility": "public",