fix: Use macos SDK 15.5 instead of 15.4 which is no longer available, b=no-bug, c=no-component

2026-01-07 05:43:21 +00:00 · 2025-07-19 21:28:07 +02:00
parent 54e1ffa91d
commit 7e63561092
1 changed files with 85 additions and 0 deletions
--- a/src/firefox-patches/ff142-macos-sdk-upgrade.patch
+++ b/src/firefox-patches/ff142-macos-sdk-upgrade.patch
@@ -0,0 +1,85 @@
+
+# HG changeset patch
+# User Julian Descottes <jdescottes@mozilla.com>
+# Date 1751026631 0
+# Node ID 12aa50c7b5bdfcc158bf9d3b7901b154e616a83d
+# Parent  6f444e37b3afb1a73681525624e04b2964282078
+Bug 1974156 - Use macos SDK 15.5 instead of 15.4 which is no longer available r=glandium
+
+Differential Revision: https://phabricator.services.mozilla.com/D255084
+
+
+diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
+--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
+@@ -228,17 +228,17 @@ with only_when(host_is_osx | target_is_o
+     option(
+         "--with-macos-sdk",
+         env="MACOS_SDK_DIR",
+         nargs=1,
+         help="Location of platform SDK to use",
+     )
+ 
+     def mac_sdk_min_version():
+-        return "15.4"
+        return "15.5"
+ 
+     @depends(
+         "--with-macos-sdk",
+         host,
+         bootstrap_path(
+             "MacOSX{}.sdk".format(mac_sdk_min_version()),
+             when=depends("--with-macos-sdk")(lambda x: not x),
+             allow_failure=True,
+diff --git a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
+--- a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
+++ b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+ <plist version="1.0">
+ <dict>
+         <key>Version</key>
+-        <string>15.4</string>
+        <string>15.5</string>
+ </dict>
+ </plist>
+diff --git a/taskcluster/kinds/toolchain/macos-sdk.yml b/taskcluster/kinds/toolchain/macos-sdk.yml
+--- a/taskcluster/kinds/toolchain/macos-sdk.yml
+++ b/taskcluster/kinds/toolchain/macos-sdk.yml
+@@ -38,20 +38,33 @@ macosx64-sdk-15.4:
+         symbol: TM(sdk15.4)
+     run:
+         arguments:
+             - https://swcdn.apple.com/content/downloads/10/32/082-12052-A_AHPGDY76PT/1a419zaf3vh8o9t3c0usblyr8eystpnsh5/CLTools_macOSNMOS_SDK.pkg
+             - fd01c70038dbef48bd23fb8b7d18f234910733635f1b44518e71a66d2db92a70180e6a595c6bdd837fa8df7e9b297e570560842e9a6db863840bd051fe69fea5
+             - Library/Developer/CommandLineTools/SDKs/MacOSX15.4.sdk
+         toolchain-artifact: project/gecko/mac-sdk/MacOSX15.4.sdk.tar.zst
+         toolchain-alias:
+-            - macosx64-sdk
+             - macosx64-sdk-toolchain
+             - MacOSX15.4.sdk
+ 
+macosx64-sdk-15.5:
+    description: "MacOSX15.5 SDK"
+    treeherder:
+        symbol: TM(sdk15.5)
+    run:
+        arguments:
+            - https://swcdn.apple.com/content/downloads/52/01/082-41241-A_0747ZN8FHV/dectd075r63pppkkzsb75qk61s0lfee22j/CLTools_macOSNMOS_SDK.pkg
+            - fb7c555e823b830279394e52c7d439bd287a9d8b007883fa0595962a240d488b5613f8cc8d1cc9657909de9367417652564f3df66e238a47bbc87244f5205056
+            - Library/Developer/CommandLineTools/SDKs/MacOSX15.5.sdk
+        toolchain-artifact: project/gecko/mac-sdk/MacOSX15.5.sdk.tar.zst
+        toolchain-alias:
+            - macosx64-sdk
+            - MacOSX15.5.sdk
+
+ ios-sdk-18.4:
+     description: "iPhoneOS18.4 SDK"
+     treeherder:
+         symbol: TM(ios18.4)
+     # Because it's using an internal tooltool artifact, it can't be used as a local-toolchain for
+     # bootstrap. But we still want to use the same script as local-toolchains.
+     attributes:
+         local-toolchain: false
+