averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #82018 from al45tair/fix-freestanding-deployment-version

Browse Source 
[Build] Fix the minimal-stdlib build by setting a deployment version.
This commit is contained in:
Ben Barham
2025-06-05 18:41:19 -07:00
committed by Alastair Houghton
parent 8eb879831c
commit 3abc025579
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/modules/DarwinSDKs.cmake
View File

@@ -22,6 +22,8 @@ is_sdk_requested(FREESTANDING swift_build_freestanding)
if(swift_build_freestanding AND (SWIFT_FREESTANDING_FLAVOR STREQUAL "apple"))
set(SWIFT_FREESTANDING_SDK "" CACHE STRING
"Which SDK to use when building the FREESTANDING stdlib")
set(SWIFT_FREESTANDING_DEPLOYMENT_VERSION "" CACHE STRING
"The deployment version to use when building the FREESTANDING stdlib")
set(SWIFT_FREESTANDING_TRIPLE_NAME "" CACHE STRING
"Which triple name (e.g. 'none-macho') to use when building the FREESTANDING stdlib")
set(SWIFT_FREESTANDING_MODULE_NAME "" CACHE STRING
@@ -31,7 +33,7 @@ if(swift_build_freestanding AND (SWIFT_FREESTANDING_FLAVOR STREQUAL "apple"))
set(SWIFT_FREESTANDING_ARCHS "" CACHE STRING
"Which architectures to build when building the FREESTANDING stdlib")
configure_sdk_darwin(
FREESTANDING "FREESTANDING" ""
FREESTANDING "FREESTANDING" "${SWIFT_FREESTANDING_DEPLOYMENT_VERSION}"
"${SWIFT_FREESTANDING_SDK}"
"${SWIFT_FREESTANDING_TRIPLE_NAME}" "${SWIFT_FREESTANDING_MODULE_NAME}"
"${SWIFT_FREESTANDING_AVAILABILITY_NAME}" "${SWIFT_FREESTANDING_ARCHS}")

2
utils/swift_build_support/swift_build_support/products/minimalstdlib.py
View File

@@ -67,6 +67,8 @@ class MinimalStdlib(cmake_product.CMakeProduct):
self.cmake_options.define(
'SWIFT_FREESTANDING_MODULE_NAME:STRING', 'macos')
self.cmake_options.define('SWIFT_FREESTANDING_SDK:STRING', 'macosx')
self.cmake_options.define('SWIFT_FREESTANDING_DEPLOYMENT_VERSION:STRING',
'11.0')
self.cmake_options.define(
'SWIFT_FREESTANDING_TRIPLE_NAME:STRING', 'macosx11.0')
self.cmake_options.define(