Bug 1424825: Update macOS SDK to 10.11; r=me draft
authorTom Prince <mozilla@hocat.ca>
Tue, 12 Dec 2017 09:08:23 -0700
changeset 57240 dca5f12cf6054a5fbf3e97f692a1542c1b21c72c
parent 57237 37c896fb3de9745e6b594aed91011ff16738a8c7
child 57241 2ed68e85b18f105cf285bbd16defcebb22b75ff7
child 57242 d0fc1fc0241171f16fe2df91de1e4defebde123d
push id5522
push usermozilla@hocat.ca
push dateTue, 12 Dec 2017 16:25:42 +0000
treeherdertry-comm-central@2ed68e85b18f [default view] [failures only]
reviewersme
bugs1424825
Bug 1424825: Update macOS SDK to 10.11; r=me
build/macosx/local-mozconfig.common
mail/config/tooltool-manifests/macosx64/check-sync-exceptions
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
@@ -14,18 +14,18 @@ elif [ -d "$topsrcdir/clang" ]; then
     # mozilla-central based build
     TOOLTOOL_DIR=$topsrcdir
 elif [ -d "$topsrcdir/../clang" ]; then
     TOOLTOOL_DIR=$topsrcdir/..
 else
     echo "Don't know where we are; can't find clang. topsrcdir: $topsrcdir"
 fi
 
-if [ -d $TOOLTOOL_DIR/MacOSX10.10.sdk ]; then
-    export CROSS_SYSROOT=$TOOLTOOL_DIR/MacOSX10.10.sdk
+if [ -d $TOOLTOOL_DIR/MacOSX10.11.sdk ]; then
+    export CROSS_SYSROOT=$TOOLTOOL_DIR/MacOSX10.11.sdk
     CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks
     FLAGS="-isysroot $CROSS_SYSROOT"
     ldflags="-Wl,-syslibroot,$CROSS_SYSROOT "
     export BINDGEN_CFLAGS="$FLAGS"
     ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
     # Since we are manually providing an SDK, don't check for xcode being installed.
     # See https://bugzilla.mozilla.org/show_bug.cgi?id=1366564
     ac_add_options --disable-xcode-checks
--- a/mail/config/tooltool-manifests/macosx64/check-sync-exceptions
+++ b/mail/config/tooltool-manifests/macosx64/check-sync-exceptions
@@ -1,5 +1,4 @@
 # Install OSX Bug 1400533
 # Until we are cross-building OSX or the OS on the build workers are updated,
 # we need to use a newer SDK than the installed SDK.
-clang.manifest
 releng.manifest
deleted file mode 100644
--- a/mail/config/tooltool-manifests/macosx64/clang.manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-  {
-    "version": "clang 3.9.0",
-    "size": 185632474,
-    "digest": "0e1a556b65d6398fa812b9ceb5ce5e2dec3eda77d4a032a818182b34fc8ce602412f42388bb1fda6bea265d35c1dde3847a730b264fec01cd7e3dcfd39941660",
-    "algorithm": "sha512",
-    "filename": "clang.tar.bz2",
-    "unpack": true
-  },
-  {
-    "version": "rustc 1.22.1 (123456789 2017-11-22) repack",
-    "size": 107159606,
-    "digest": "d15a6bf376f7a7e2a247970ce649faa67630484d6ad0a808e099407d3ea1f84da44010da99ea495553c2e2f07c88d610d0bb6375ff3e05b572feeecc359a151e",
-    "algorithm": "sha512",
-    "filename": "rustc.tar.bz2",
-    "unpack": true
-  },
-  {
-    "version": "sccache rev 69334a26ba65fc88e3934271a2ce6781c51b445e",
-    "algorithm": "sha512",
-    "visibility": "public",
-    "filename": "sccache2.tar.bz2",
-    "unpack": true,
-    "digest": "7ace40311de3d466f20476ce27c24f25208e8dd80151cbff2e72bab75038dee429312703f13a832c9671bb42dc22a00801c5eb5a9e4d807f2723c16e33167d1b",
-    "size": 1658526
-  },
-  {
-    "version": "cctools port from commit hash 8e9c3f2506b51",
-    "size": 2233376,
-    "digest": "d632ef587f0253f016aa5323999a3d9576284c04e66b5243a5780af9a55f474ac91ad8dee5bd86a6ee4e2593e2b345e2fd0aa4e8838b3686f84c5c5ac5c9c418",
-    "algorithm": "sha512",
-    "filename": "cctools.tar.bz2",
-    "unpack": true
-  },
-  {
-    "size":  30823112,
-    "visibility": "internal",
-    "digest": "0c58e06a3ea8f4641c991a7406fc8733c574f0b4aa773bce0feaa5468d2b8440fa33cea056e16fad2b8a7ef4409ca7228113eb12adc87c3e115129d8a3b3b565",
-    "algorithm": "sha512",
-    "unpack": true,
-    "filename": "MacOSX10.10.sdk.tar.xz"
-  }
-]
--- a/mail/config/tooltool-manifests/macosx64/releng.manifest
+++ b/mail/config/tooltool-manifests/macosx64/releng.manifest
@@ -28,16 +28,16 @@
     "algorithm": "sha512",
     "visibility": "public",
     "filename": "sccache2.tar.bz2",
     "unpack": true,
     "digest": "7ace40311de3d466f20476ce27c24f25208e8dd80151cbff2e72bab75038dee429312703f13a832c9671bb42dc22a00801c5eb5a9e4d807f2723c16e33167d1b",
     "size": 1658526
   },
   {
-    "size":  30823112,
+    "size": 34094283,
     "visibility": "internal",
-    "digest": "0c58e06a3ea8f4641c991a7406fc8733c574f0b4aa773bce0feaa5468d2b8440fa33cea056e16fad2b8a7ef4409ca7228113eb12adc87c3e115129d8a3b3b565",
+    "digest": "8811050fe375bcc566c8b85173d86b8a87aa2148edfed93023735c2de44b66a5a28cbaa1cfd396032447fd803e03f308ed941a200c0e2a1ad9fbe16b5606ee7c",
     "algorithm": "sha512",
     "unpack": true,
-    "filename": "MacOSX10.10.sdk.tar.xz"
+    "filename": "MacOSX10.11.sdk.tar.xz"
   }
 ]