Bug 1919962 - Add MacOS 15.0 SDK. r=firefox-build-system-reviewers,glandium

This patch adds a new macOS sdk (15.0) toolchain.

Additionally, the SDK is updated for custom-car builds as those tasks
were previously failing on an outdated SDK.

Differential Revision: https://phabricator.services.mozilla.com/D223250
This commit is contained in:
KS 2024-09-24 12:00:00 +00:00
parent 363e52871d
commit 3b806996d7
4 changed files with 16 additions and 3 deletions

View File

@ -93,7 +93,7 @@ def main():
parser.add_argument(
"--catalog",
help="URL of the catalog",
default="https://swscan.apple.com/content/catalogs/others/index-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
default="https://swscan.apple.com/content/catalogs/others/index-15-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
)
parser.add_argument(
"--filter", help="Only show entries with metadata url matching the filter"

View File

@ -47,6 +47,19 @@ macosx64-sdk-14.4:
- macosx64-sdk-toolchain
- MacOSX14.4.sdk
macosx64-sdk-15.0:
description: "MacOSX15.0 SDK"
treeherder:
symbol: TM(sdk15.0)
run:
arguments:
- https://swcdn.apple.com/content/downloads/33/46/042-32691-A_3MH7S3118O/3dblccqo9ws17dc5lk3hojfbt3s74q0ql6/CLTools_macOSNMOS_SDK.pkg
- c971561df8ca51a0ea581092ad11eba2d9b1ca5622c0ef911465f5915f8bed1a2228f8e65ea7af70c144b7c8d95aacb09ab39b899aa23a988b53ffc818875688
- Library/Developer/CommandLineTools/SDKs/MacOSX15.0.sdk
toolchain-artifact: project/gecko/mac-sdk/MacOSX15.0.sdk.tar.zst
toolchain-alias:
- MacOSX15.0.sdk
ios-sdk-17.4:
description: "iPhoneOS17.4 SDK"
treeherder:

View File

@ -234,7 +234,7 @@ macosx-arm64-custom-car:
toolchain-artifact: public/build/car_macosx_arm.tar.zst
fetches:
toolchain:
- macosx64-sdk-14.4
- MacOSX15.0.sdk
android-custom-car:
description: "Custom chromium-as-release build for Android"

View File

@ -59,7 +59,7 @@ fi
# Logic for macosx64
if [[ $(uname -s) == "Darwin" ]]; then
# Modify the config with fetched sdk path
export MACOS_SYSROOT="$MOZ_FETCHES_DIR/MacOSX14.4.sdk"
export MACOS_SYSROOT="$MOZ_FETCHES_DIR/MacOSX15.0.sdk"
# Avoid mixing up the system python and toolchain python in the
# python path configuration