Skip to content

Commit 51683c4

Browse files
Fix the Swift for macOS installer to encode a minimum OS version for installation (#83273)
Right now it defaults to macOS 10.11, which is of course far below the intended supported version.
1 parent b2ad483 commit 51683c4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

utils/build-script-impl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3172,7 +3172,7 @@ function build_and_test_installable_package() {
31723172
echo "-- Create Installer --"
31733173
call "${SWIFT_SOURCE_DIR}/utils/toolchain-installer" "${host_install_destdir}${TOOLCHAIN_PREFIX}/" "${DARWIN_TOOLCHAIN_BUNDLE_IDENTIFIER}" \
31743174
"${DARWIN_TOOLCHAIN_INSTALLER_CERT}" "${DARWIN_TOOLCHAIN_INSTALLER_PACKAGE}" "${DARWIN_TOOLCHAIN_INSTALL_LOCATION}" \
3175-
"${DARWIN_TOOLCHAIN_VERSION}" "${SWIFT_SOURCE_DIR}/utils/darwin-installer-scripts"
3175+
"${DARWIN_TOOLCHAIN_VERSION}" "${SWIFT_SOURCE_DIR}/utils/darwin-installer-scripts" "${DARWIN_DEPLOYMENT_VERSION_OSX}"
31763176
fi
31773177

31783178
# host_install_destdir contains the toolchain prefix.

utils/toolchain-installer

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ DARWIN_INSTALLER_PACKAGE=$4
1818
DARWIN_TOOLCHAIN_INSTALL_LOCATION=$5
1919
DARWIN_TOOLCHAIN_VERSION=$6
2020
DARWIN_SCRIPTS=$7
21+
DARWIN_DEPLOYMENT_VERSION_OSX=$8
2122

2223
pkgbuild --root "${TOOLCHAIN_PREFIX}" --install-location "${DARWIN_TOOLCHAIN_INSTALL_LOCATION}" "${DARWIN_INSTALLER_PACKAGE}" \
2324
--version "${DARWIN_TOOLCHAIN_VERSION}" --identifier "${DARWIN_BUNDLE_IDENTIFIER}" --sign "${DARWIN_INSTALLER_CERT}" \
24-
--scripts "${DARWIN_SCRIPTS}"
25+
--scripts "${DARWIN_SCRIPTS}" --min-os-version "${DARWIN_DEPLOYMENT_VERSION_OSX}"

0 commit comments

Comments
 (0)