Skip to content

Commit 41f91d5

Browse files
authored
Add a SWIFT_FREESTANDING_MODULE_NAME CMake option (swiftlang#34018)
1 parent 12c356b commit 41f91d5

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

cmake/modules/DarwinSDKs.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,14 @@ if(swift_build_freestanding)
3232
"Which SDK to use when building the FREESTANDING stdlib")
3333
set(SWIFT_FREESTANDING_TRIPLE_NAME "" CACHE STRING
3434
"Which triple name (e.g. 'none-macho') to use when building the FREESTANDING stdlib")
35+
set(SWIFT_FREESTANDING_MODULE_NAME "" CACHE STRING
36+
"Which .swiftmodule name (e.g. 'freestanding') to use when building the FREESTANDING stdlib")
3537
set(SWIFT_FREESTANDING_ARCHS "" CACHE STRING
3638
"Which architectures to build when building the FREESTANDING stdlib")
3739
configure_sdk_darwin(
3840
FREESTANDING "FREESTANDING" ""
39-
"${SWIFT_FREESTANDING_SDK}" freestanding "${SWIFT_FREESTANDING_TRIPLE_NAME}" freestanding "${SWIFT_FREESTANDING_ARCHS}")
41+
"${SWIFT_FREESTANDING_SDK}" freestanding
42+
"${SWIFT_FREESTANDING_TRIPLE_NAME}" "${SWIFT_FREESTANDING_MODULE_NAME}" "${SWIFT_FREESTANDING_ARCHS}")
4043
set(SWIFT_SDK_FREESTANDING_LIB_SUBDIR "freestanding")
4144
configure_target_variant(FREESTANDING-DA "FREESTANDING Debug+Asserts" FREESTANDING DA "Debug+Asserts")
4245
configure_target_variant(FREESTANDING-RA "FREESTANDING Release+Asserts" FREESTANDING RA "Release+Asserts")

utils/build-presets.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2469,6 +2469,7 @@ swift-primary-variant-arch=x86_64
24692469
swift-freestanding-sdk=macosx
24702470
# For now, until clang/swiftc works correctly with "none-macho" as the OS part of target triple.
24712471
swift-freestanding-triple-name=macosx11.0
2472+
swift-freestanding-module-name=macos
24722473
swift-freestanding-archs=x86_64
24732474

24742475
#===----------------------------------------------------------------------===#

utils/build-script-impl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ KNOWN_SETTINGS=(
202202
## FREESTANDING Stdlib Options
203203
swift-freestanding-sdk "" "which SDK to use when building the FREESTANDING stdlib"
204204
swift-freestanding-triple-name "" "which triple name (e.g. 'none-macho') to use when building the FREESTANDING stdlib"
205+
swift-freestanding-module-name "" "which .swiftmodule name (e.g. 'freestanding') to use when building the FREESTANDING stdlib"
205206
swift-freestanding-archs "" "space-separated list of which architectures to build when building the FREESTANDING stdlib"
206207

207208
## Uncategorised
@@ -1901,6 +1902,13 @@ for host in "${ALL_HOSTS[@]}"; do
19011902
)
19021903
fi
19031904

1905+
if [ "${SWIFT_FREESTANDING_MODULE_NAME}" ] ; then
1906+
cmake_options=(
1907+
"${cmake_options[@]}"
1908+
-DSWIFT_FREESTANDING_MODULE_NAME:STRING="${SWIFT_FREESTANDING_MODULE_NAME}"
1909+
)
1910+
fi
1911+
19041912
if [[ "${SWIFT_FREESTANDING_ARCHS}" ]] ; then
19051913
cmake_options=(
19061914
"${cmake_options[@]}"

0 commit comments

Comments
 (0)