Skip to content

Commit c079c08

Browse files
kubamracekkubamracek
authored
Split SWIFT_DARWIN_PLATFORMS and SWIFT_APPLE_PLATFORMS in CMake. SWIFT_APPLE_PLATFORMS may contain 'FREESTANDING' when building the freestanding SDK and SWIFT_FREESTANDING_FLAVOR is set to 'apple'. (#38997)
1 parent 62e7139 commit c079c08

File tree

14 files changed

+42
-39
lines changed

14 files changed

+42
-39
lines changed

‎CMakeLists.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,10 +612,15 @@ set(SWIFT_DARWIN_VARIANTS "^(macosx|iphoneos|iphonesimulator|appletvos|appletvsi
612612
set(SWIFT_DARWIN_EMBEDDED_VARIANTS "^(iphoneos|iphonesimulator|appletvos|appletvsimulator|watchos|watchsimulator)")
613613

614614
# A convenient list to match Darwin SDKs. Example:
615-
# if("${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS)
615+
# if("${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_DARWIN_PLATFORMS)
616616
# ...
617617
# endif()
618-
set(SWIFT_APPLE_PLATFORMS "IOS" "IOS_SIMULATOR" "TVOS" "TVOS_SIMULATOR" "WATCHOS" "WATCHOS_SIMULATOR" "OSX")
618+
set(SWIFT_DARWIN_PLATFORMS "IOS" "IOS_SIMULATOR" "TVOS" "TVOS_SIMULATOR" "WATCHOS" "WATCHOS_SIMULATOR" "OSX")
619+
620+
set(SWIFT_APPLE_PLATFORMS ${SWIFT_DARWIN_PLATFORMS})
621+
if(SWIFT_FREESTANDING_FLAVOR STREQUAL "apple")
622+
list(APPEND SWIFT_APPLE_PLATFORMS "FREESTANDING")
623+
endif()
619624

620625
# Configuration flags passed to all of our invocations of gyb. Try to
621626
# avoid making up new variable names here if you can find a CMake

‎cmake/modules/AddSwift.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ endfunction()
110110
# Usage:
111111
# _add_host_variant_c_compile_link_flags(name)
112112
function(_add_host_variant_c_compile_link_flags name)
113-
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
113+
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
114114
set(DEPLOYMENT_VERSION "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")
115115
endif()
116116

@@ -153,7 +153,7 @@ function(_add_host_variant_c_compile_link_flags name)
153153
endif()
154154
endif()
155155

156-
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
156+
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
157157
# We collate -F with the framework path to avoid unwanted deduplication
158158
# of options by target_compile_options -- this way no undesired
159159
# side effects are introduced should a new search path be added.
@@ -537,7 +537,7 @@ function(add_swift_host_library name)
537537
BINARY_DIR ${SWIFT_RUNTIME_OUTPUT_INTDIR}
538538
LIBRARY_DIR ${SWIFT_LIBRARY_OUTPUT_INTDIR})
539539

540-
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
540+
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
541541
set_target_properties(${name} PROPERTIES
542542
INSTALL_NAME_DIR "@rpath")
543543
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX)
@@ -596,7 +596,7 @@ function(add_swift_host_library name)
596596
set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX)
597597
endif()
598598

599-
if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)
599+
if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)
600600
target_link_options(${name} PRIVATE
601601
"LINKER:-compatibility_version,1")
602602
if(SWIFT_COMPILER_VERSION)
@@ -723,7 +723,7 @@ function(add_libswift name)
723723

724724
set(build_dir ${CMAKE_CURRENT_BINARY_DIR})
725725

726-
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
726+
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
727727
set(deployment_version "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")
728728
endif()
729729
get_versioned_target_triple(target ${SWIFT_HOST_VARIANT_SDK}
@@ -821,7 +821,7 @@ function(add_swift_host_tool executable)
821821
set_target_properties(${executable} PROPERTIES
822822
JOB_POOL_LINK swift_link_job_pool)
823823
endif()
824-
if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)
824+
if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)
825825
# If we found a swift compiler and are going to use swift code in swift
826826
# host side tools but link with clang, add the appropriate -L paths so we
827827
# find all of the necessary swift libraries on Darwin.

‎cmake/modules/Libdispatch.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ endif()
4646

4747
# Build any target libdispatch if needed.
4848
foreach(sdk ${SWIFT_SDKS})
49-
# Apple targets have libdispatch available, do not build it.
50-
if(NOT "${sdk}" IN_LIST SWIFT_APPLE_PLATFORMS)
49+
# Darwin targets have libdispatch available, do not build it.
50+
if(NOT "${sdk}" IN_LIST SWIFT_DARWIN_PLATFORMS)
5151
list(APPEND DISPATCH_SDKS "${sdk}")
5252
endif()
5353
endforeach()

‎cmake/modules/StandaloneOverlay.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ set(CMAKE_INSTALL_PREFIX
9090
"${SWIFT_DEST_ROOT}${TOOLCHAIN_DIR}/usr")
9191

9292

93-
set(SWIFT_APPLE_PLATFORMS
93+
set(SWIFT_DARWIN_PLATFORMS
9494
OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR)
9595

9696
# Flags used to indicate we are building a standalone overlay.

‎cmake/modules/SwiftConfigureSDK.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function(_report_sdk prefix)
2424
message(STATUS " ${CMAKE_BUILD_TYPE} VC++ CRT: MD")
2525
endif()
2626
endif()
27-
if(prefix IN_LIST SWIFT_APPLE_PLATFORMS)
27+
if(prefix IN_LIST SWIFT_DARWIN_PLATFORMS)
2828
message(STATUS " Version: ${SWIFT_SDK_${prefix}_VERSION}")
2929
message(STATUS " Build number: ${SWIFT_SDK_${prefix}_BUILD_NUMBER}")
3030
message(STATUS " Deployment version: ${SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION}")
@@ -60,7 +60,7 @@ function(_report_sdk prefix)
6060
endforeach()
6161
endif()
6262

63-
if(NOT prefix IN_LIST SWIFT_APPLE_PLATFORMS)
63+
if(NOT prefix IN_LIST SWIFT_DARWIN_PLATFORMS)
6464
foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
6565
message(STATUS " ${arch} libc header path: ${SWIFT_SDK_${prefix}_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY}")
6666
message(STATUS " ${arch} libc architecture specific header path: ${SWIFT_SDK_${prefix}_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY}")

‎stdlib/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ if(SWIFT_BUILD_DYNAMIC_STDLIB)
165165
list(APPEND SWIFT_STDLIB_LIBRARY_BUILD_TYPES SHARED)
166166
endif()
167167
if(SWIFT_BUILD_STATIC_STDLIB)
168-
list_intersect("${SWIFT_APPLE_PLATFORMS}" "${SWIFT_SDKS}" building_darwin_sdks)
168+
list_intersect("${SWIFT_DARWIN_PLATFORMS}" "${SWIFT_SDKS}" building_darwin_sdks)
169169
if(building_darwin_sdks)
170170
message(SEND_ERROR "cannot build static standard library for Darwin SDKs")
171171
else()

‎stdlib/cmake/modules/AddSwiftStdlib.cmake‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function(_add_target_variant_c_compile_link_flags)
4949

5050
set(result ${${CFLAGS_RESULT_VAR_NAME}})
5151

52-
if("${CFLAGS_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS)
52+
if("${CFLAGS_SDK}" IN_LIST SWIFT_DARWIN_PLATFORMS)
5353
# Check if there's a specific OS deployment version needed for this invocation
5454
if("${CFLAGS_SDK}" STREQUAL "OSX")
5555
if(DEFINED maccatalyst_build_flavor)
@@ -102,7 +102,7 @@ function(_add_target_variant_c_compile_link_flags)
102102
endif()
103103
endif()
104104

105-
if("${CFLAGS_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS)
105+
if("${CFLAGS_SDK}" IN_LIST SWIFT_DARWIN_PLATFORMS)
106106
# We collate -F with the framework path to avoid unwanted deduplication
107107
# of options by target_compile_options -- this way no undesired
108108
# side effects are introduced should a new search path be added.
@@ -827,7 +827,7 @@ function(_add_swift_target_library_single target name)
827827
endif()
828828

829829
# Only build the modules for any arch listed in the *_MODULE_ARCHITECTURES.
830-
if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_APPLE_PLATFORMS
830+
if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS
831831
AND SWIFTLIB_SINGLE_ARCHITECTURE IN_LIST SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_MODULE_ARCHITECTURES)
832832
# Create dummy target to hook up the module target dependency.
833833
add_custom_target("${target}"
@@ -959,7 +959,7 @@ function(_add_swift_target_library_single target name)
959959
endforeach()
960960
endif()
961961

962-
if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
962+
if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
963963
set(install_name_dir "@rpath")
964964

965965
if(SWIFTLIB_SINGLE_IS_STDLIB)
@@ -1194,7 +1194,7 @@ function(_add_swift_target_library_single target name)
11941194

11951195
# Configure plist creation for OS X.
11961196
set(PLIST_INFO_PLIST "Info.plist" CACHE STRING "Plist name")
1197-
if("${SWIFTLIB_SINGLE_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS AND SWIFTLIB_SINGLE_IS_STDLIB)
1197+
if("${SWIFTLIB_SINGLE_SDK}" IN_LIST SWIFT_DARWIN_PLATFORMS AND SWIFTLIB_SINGLE_IS_STDLIB)
11981198
set(PLIST_INFO_NAME ${name})
11991199
set(PLIST_INFO_UTI "com.apple.dt.runtime.${name}")
12001200
set(PLIST_INFO_VERSION "${SWIFT_VERSION}")
@@ -1251,7 +1251,7 @@ function(_add_swift_target_library_single target name)
12511251
${c_compile_flags})
12521252
target_link_options(${target} PRIVATE
12531253
${link_flags})
1254-
if(${SWIFTLIB_SINGLE_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)
1254+
if(${SWIFTLIB_SINGLE_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)
12551255
target_link_options(${target} PRIVATE
12561256
"LINKER:-compatibility_version,1")
12571257
if(SWIFT_COMPILER_VERSION)
@@ -1614,7 +1614,7 @@ function(add_swift_target_library name)
16141614
if("${SWIFTLIB_TARGET_SDKS}" STREQUAL "")
16151615
set(SWIFTLIB_TARGET_SDKS ${SWIFT_SDKS})
16161616
endif()
1617-
list_replace(SWIFTLIB_TARGET_SDKS ALL_APPLE_PLATFORMS "${SWIFT_APPLE_PLATFORMS}")
1617+
list_replace(SWIFTLIB_TARGET_SDKS ALL_APPLE_PLATFORMS "${SWIFT_DARWIN_PLATFORMS}")
16181618

16191619
# All Swift code depends on the standard library, except for the standard
16201620
# library itself.
@@ -1832,7 +1832,7 @@ function(add_swift_target_library name)
18321832
list(APPEND swiftlib_link_flags_all "-Wl,-z,defs")
18331833
endif()
18341834
# Setting back linker flags which are not supported when making Android build on macOS cross-compile host.
1835-
if(SWIFTLIB_SHARED AND sdk IN_LIST SWIFT_APPLE_PLATFORMS)
1835+
if(SWIFTLIB_SHARED AND sdk IN_LIST SWIFT_DARWIN_PLATFORMS)
18361836
list(APPEND swiftlib_link_flags_all "-dynamiclib -Wl,-headerpad_max_install_names")
18371837
endif()
18381838

@@ -1952,7 +1952,7 @@ function(add_swift_target_library name)
19521952
list(APPEND swiftlib_link_flags_all "-F${ios_support_frameworks_path}")
19531953
endif()
19541954

1955-
if(sdk IN_LIST SWIFT_APPLE_PLATFORMS AND SWIFTLIB_IS_SDK_OVERLAY)
1955+
if(sdk IN_LIST SWIFT_DARWIN_PLATFORMS AND SWIFTLIB_IS_SDK_OVERLAY)
19561956
set(swiftlib_swift_compile_private_frameworks_flag "-Fsystem" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/System/Library/PrivateFrameworks/")
19571957
foreach(tbd_lib ${SWIFTLIB_SWIFT_MODULE_DEPENDS_FROM_SDK})
19581958
list(APPEND swiftlib_link_flags_all "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/usr/lib/swift/libswift${tbd_lib}.tbd")
@@ -2066,8 +2066,7 @@ function(add_swift_target_library name)
20662066
endif()
20672067
endif()
20682068

2069-
if((sdk IN_LIST SWIFT_APPLE_PLATFORMS)
2070-
OR (sdk STREQUAL "FREESTANDING"))
2069+
if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)
20712070
# In the past, we relied on unsetting globally
20722071
# CMAKE_OSX_ARCHITECTURES to ensure that CMake would
20732072
# not add the -arch flag
@@ -2174,7 +2173,7 @@ function(add_swift_target_library name)
21742173
endif()
21752174

21762175
set(optional_arg)
2177-
if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)
2176+
if(sdk IN_LIST SWIFT_DARWIN_PLATFORMS)
21782177
# Allow installation of stdlib without building all variants on Darwin.
21792178
set(optional_arg "OPTIONAL")
21802179
endif()
@@ -2434,7 +2433,7 @@ function(_add_swift_target_executable_single name)
24342433
if (SWIFT_PARALLEL_LINK_JOBS)
24352434
set_property(TARGET ${name} PROPERTY JOB_POOL_LINK swift_link_job_pool)
24362435
endif()
2437-
if(${SWIFTEXE_SINGLE_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)
2436+
if(${SWIFTEXE_SINGLE_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)
24382437
set_target_properties(${name} PROPERTIES
24392438
BUILD_WITH_INSTALL_RPATH YES
24402439
INSTALL_RPATH "@executable_path/../lib/swift/${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}")
@@ -2516,8 +2515,7 @@ function(add_swift_target_executable name)
25162515
EXCLUDE_FROM_ALL TRUE)
25172516
endif()
25182517

2519-
if((${sdk} IN_LIST SWIFT_APPLE_PLATFORMS)
2520-
OR (sdk STREQUAL "FREESTANDING"))
2518+
if(${sdk} IN_LIST SWIFT_APPLE_PLATFORMS)
25212519
# In the past, we relied on unsetting globally
25222520
# CMAKE_OSX_ARCHITECTURES to ensure that CMake would
25232521
# not add the -arch flag

‎stdlib/cmake/modules/SwiftSource.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function(handle_swift_sources
113113
# FIXME: We shouldn't /have/ to build things in a single process.
114114
# <rdar://problem/15972329>
115115
list(APPEND swift_compile_flags "-whole-module-optimization")
116-
if(sdk IN_LIST SWIFT_APPLE_PLATFORMS OR sdk STREQUAL "MACCATALYST")
116+
if(sdk IN_LIST SWIFT_DARWIN_PLATFORMS OR sdk STREQUAL "MACCATALYST")
117117
list(APPEND swift_compile_flags "-save-optimization-record=bitstream")
118118
endif()
119119
if (SWIFTSOURCES_ENABLE_LTO)
@@ -218,7 +218,7 @@ function(_add_target_variant_swift_compile_flags
218218
list(APPEND result "-sdk" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}")
219219
endif()
220220

221-
if("${sdk}" IN_LIST SWIFT_APPLE_PLATFORMS)
221+
if("${sdk}" IN_LIST SWIFT_DARWIN_PLATFORMS)
222222
set(sdk_deployment_version "${SWIFT_SDK_${sdk}_DEPLOYMENT_VERSION}")
223223
get_target_triple(target target_variant "${sdk}" "${arch}"
224224
MACCATALYST_BUILD_FLAVOR "${VARIANT_MACCATALYST_BUILD_FLAVOR}"
@@ -237,7 +237,7 @@ function(_add_target_variant_swift_compile_flags
237237
list(APPEND result "-resource-dir" "${SWIFTLIB_DIR}")
238238
endif()
239239

240-
if("${sdk}" IN_LIST SWIFT_APPLE_PLATFORMS)
240+
if("${sdk}" IN_LIST SWIFT_DARWIN_PLATFORMS)
241241
# We collate -F with the framework path to avoid unwanted deduplication
242242
# of options by target_compile_options -- this way no undesired
243243
# side effects are introduced should a new search path be added.
@@ -543,7 +543,7 @@ function(_compile_swift_files
543543
endif()
544544

545545
set(optional_arg)
546-
if(SWIFTFILE_SDK IN_LIST SWIFT_APPLE_PLATFORMS OR
546+
if(SWIFTFILE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS OR
547547
SWIFTFILE_SDK STREQUAL "MACCATALYST")
548548
# Allow installation of stdlib without building all variants on Darwin.
549549
set(optional_arg "OPTIONAL")

‎stdlib/public/core/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ set(swift_core_link_flags "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}")
233233
set(swift_core_framework_depends)
234234
set(swift_core_private_link_libraries)
235235
set(swift_stdlib_compile_flags "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}")
236-
if(SWIFT_PRIMARY_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
236+
if(SWIFT_PRIMARY_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
237237
list(APPEND swift_core_link_flags "-all_load")
238238
list(APPEND swift_core_private_link_libraries icucore)
239239
else()

‎stdlib/public/stubs/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ add_swift_target_library(swiftStdlibStubs
4343
INSTALL_IN_COMPONENT
4444
stdlib)
4545

46-
if("${SWIFT_PRIMARY_VARIANT_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS)
46+
if("${SWIFT_PRIMARY_VARIANT_SDK}" IN_LIST SWIFT_DARWIN_PLATFORMS)
4747
set_property(SOURCE
4848
SwiftNativeNSXXXBaseARC.m
4949
APPEND_STRING PROPERTY COMPILE_FLAGS

0 commit comments

Comments
 (0)