Bug 1833998 - Switch Firefox builds to macOS 13.3 SDK. r=firefox-buil…

…d-system-reviewers,sergesanspaille Differential Revision: https://phabricator.services.mozilla.com/D178500
dothq · May 25, 2023 · 04d95a1 · 04d95a1
1 parent 4e5b262
commit 04d95a1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
@@ -96,7 +96,7 @@ with only_when(host_is_osx | target_is_osx):
         return Version(obj["Version"])
 
     def sdk_min_version():
-        return "13.0"
+        return "13.3"
 
     @depends(
         "--with-macos-sdk",

diff --git a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
         <key>Version</key>
-        <string>13.0</string>
+        <string>13.3</string>
 </dict>
 </plist>
diff --git a/taskcluster/ci/toolchain/macos-sdk.yml b/taskcluster/ci/toolchain/macos-sdk.yml
@@ -28,7 +28,6 @@ macosx64-sdk-13.0:
             - Library/Developer/CommandLineTools/SDKs/MacOSX13.0.sdk
         toolchain-artifact: project/gecko/mac-sdk/MacOSX13.0.sdk.tar.zst
         toolchain-alias:
-            - macosx64-sdk
             - MacOSX13.0.sdk
         resources:
             - python/mozbuild/mozpack/macpkg.py
@@ -49,6 +48,7 @@ macosx64-sdk-13.3:
             - Library/Developer/CommandLineTools/SDKs/MacOSX13.3.sdk
         toolchain-artifact: project/gecko/mac-sdk/MacOSX13.3.sdk.tar.zst
         toolchain-alias:
+            - macosx64-sdk
             - macosx64-sdk-toolchain
             - MacOSX13.3.sdk
         resources:

diff --git a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
@@ -3,7 +3,7 @@ set -x -e -v
 
 export TARGET_TRIPLE="x86_64-apple-darwin"
 
-MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX13.0.sdk"
+MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX13.3.sdk"
 CLANGDIR="${MOZ_FETCHES_DIR}/clang"
 
 # Deploy the wrench dependencies

diff --git a/widget/cocoa/docs/sdks.md b/widget/cocoa/docs/sdks.md
@@ -19,7 +19,7 @@ ac_add_options --with-macos-sdk=/Users/username/SDKs/MacOSX11.3.sdk
 First off, Firefox runs on 10.12 and above. This is called the "minimum deployment target" and is
 independent of the SDK version.
 
-Our official Firefox builds compiled in CI (continuous integration) currently use the 11.3 SDK (last updated in [bug 1788854](https://bugzilla.mozilla.org/show_bug.cgi?id=1788854)). This is also the minimum supported SDK version for local builds.
+Our official Firefox builds compiled in CI (continuous integration) currently use the 13.3 SDK (last updated in [bug 1833998](https://bugzilla.mozilla.org/show_bug.cgi?id=1833998)). This is also the minimum supported SDK version for local builds.
 
 Compiling with different SDKs breaks from time to time. Such breakages should be [reported in Bugzilla](https://bugzilla.mozilla.org/enter_bug.cgi?blocked=mach-busted&bug_type=defect&cc=:spohl,:mstange&component=General&form_name=enter_bug&keywords=regression&op_sys=macOS&product=Firefox%20Build%20System&rep_platform=All) and fixed quickly.