From 364c6d37765add499c8adf771891358d7213e359 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 23 Jul 2025 16:21:37 -0700 Subject: [PATCH] Fix the Swift for macOS installer to encode a minimum OS version for installation Right now it defaults to macOS 10.11, which is of course far below the intended supported version. --- utils/build-script-impl | 2 +- utils/toolchain-installer | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/build-script-impl b/utils/build-script-impl index 05e4f668e0093..73a6e442c24d5 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -3177,7 +3177,7 @@ function build_and_test_installable_package() { echo "-- Create Installer --" call "${SWIFT_SOURCE_DIR}/utils/toolchain-installer" "${host_install_destdir}${TOOLCHAIN_PREFIX}/" "${DARWIN_TOOLCHAIN_BUNDLE_IDENTIFIER}" \ "${DARWIN_TOOLCHAIN_INSTALLER_CERT}" "${DARWIN_TOOLCHAIN_INSTALLER_PACKAGE}" "${DARWIN_TOOLCHAIN_INSTALL_LOCATION}" \ - "${DARWIN_TOOLCHAIN_VERSION}" "${SWIFT_SOURCE_DIR}/utils/darwin-installer-scripts" + "${DARWIN_TOOLCHAIN_VERSION}" "${SWIFT_SOURCE_DIR}/utils/darwin-installer-scripts" "${DARWIN_DEPLOYMENT_VERSION_OSX}" fi # host_install_destdir contains the toolchain prefix. diff --git a/utils/toolchain-installer b/utils/toolchain-installer index 28fc10fcd902d..4801fac9aee4f 100755 --- a/utils/toolchain-installer +++ b/utils/toolchain-installer @@ -18,7 +18,8 @@ DARWIN_INSTALLER_PACKAGE=$4 DARWIN_TOOLCHAIN_INSTALL_LOCATION=$5 DARWIN_TOOLCHAIN_VERSION=$6 DARWIN_SCRIPTS=$7 +DARWIN_DEPLOYMENT_VERSION_OSX=$8 pkgbuild --root "${TOOLCHAIN_PREFIX}" --install-location "${DARWIN_TOOLCHAIN_INSTALL_LOCATION}" "${DARWIN_INSTALLER_PACKAGE}" \ --version "${DARWIN_TOOLCHAIN_VERSION}" --identifier "${DARWIN_BUNDLE_IDENTIFIER}" --sign "${DARWIN_INSTALLER_CERT}" \ - --scripts "${DARWIN_SCRIPTS}" + --scripts "${DARWIN_SCRIPTS}" --min-os-version "${DARWIN_DEPLOYMENT_VERSION_OSX}"