Skip to content

Commit bf43bcf

Browse files
committed
Merge remote-tracking branch 'origin/main' into rebranch
2 parents 92766c8 + 7b4d1bc commit bf43bcf

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

cmake/modules/DarwinSDKs.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ is_sdk_requested(FREESTANDING swift_build_freestanding)
2222
if(swift_build_freestanding AND (SWIFT_FREESTANDING_FLAVOR STREQUAL "apple"))
2323
set(SWIFT_FREESTANDING_SDK "" CACHE STRING
2424
"Which SDK to use when building the FREESTANDING stdlib")
25+
set(SWIFT_FREESTANDING_DEPLOYMENT_VERSION "" CACHE STRING
26+
"The deployment version to use when building the FREESTANDING stdlib")
2527
set(SWIFT_FREESTANDING_TRIPLE_NAME "" CACHE STRING
2628
"Which triple name (e.g. 'none-macho') to use when building the FREESTANDING stdlib")
2729
set(SWIFT_FREESTANDING_MODULE_NAME "" CACHE STRING
@@ -31,7 +33,7 @@ if(swift_build_freestanding AND (SWIFT_FREESTANDING_FLAVOR STREQUAL "apple"))
3133
set(SWIFT_FREESTANDING_ARCHS "" CACHE STRING
3234
"Which architectures to build when building the FREESTANDING stdlib")
3335
configure_sdk_darwin(
34-
FREESTANDING "FREESTANDING" ""
36+
FREESTANDING "FREESTANDING" "${SWIFT_FREESTANDING_DEPLOYMENT_VERSION}"
3537
"${SWIFT_FREESTANDING_SDK}"
3638
"${SWIFT_FREESTANDING_TRIPLE_NAME}" "${SWIFT_FREESTANDING_MODULE_NAME}"
3739
"${SWIFT_FREESTANDING_AVAILABILITY_NAME}" "${SWIFT_FREESTANDING_ARCHS}")

utils/swift_build_support/swift_build_support/products/minimalstdlib.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ def build(self, host_target):
6767
self.cmake_options.define(
6868
'SWIFT_FREESTANDING_MODULE_NAME:STRING', 'macos')
6969
self.cmake_options.define('SWIFT_FREESTANDING_SDK:STRING', 'macosx')
70+
self.cmake_options.define('SWIFT_FREESTANDING_DEPLOYMENT_VERSION:STRING',
71+
'11.0')
7072
self.cmake_options.define(
7173
'SWIFT_FREESTANDING_TRIPLE_NAME:STRING', 'macosx11.0')
7274
self.cmake_options.define(

0 commit comments

Comments
 (0)