Skip to content

Commit 41d9c2c

Browse files
committed
stdlib: restructure for OS family layout of SDK overlay
The SDK directory is now confusing as the Windows target also has a SDK overlay. In order to make this more uniform, move the SDK directory to Darwin which covers the fact that this covers the XNU family of OSes. The Windows directory contains the SDK overlay for the Windows target.
1 parent 9694851 commit 41d9c2c

File tree

241 files changed

+16
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+16
-17
lines changed

stdlib/public/CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,12 @@ if(SWIFT_BUILD_SDK_OVERLAY)
6868
add_subdirectory(Platform)
6969
endif()
7070

71-
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
72-
if(SWIFT_BUILD_SDK_OVERLAY)
73-
add_subdirectory(SDK)
71+
if(SWIFT_BUILD_SDK_OVERLAY)
72+
list_intersect("${SWIFT_APPLE_PLATFORMS}" "${SWIFT_SDKS}" building_darwin_sdks)
73+
if(building_darwin_sdks)
74+
add_subdirectory(Darwin)
7475
endif()
75-
endif()
7676

77-
if(SWIFT_BUILD_SDK_OVERLAY)
7877
if(WINDOWS IN_LIST SWIFT_SDKS)
7978
add_subdirectory(Windows)
8079
endif()

0 commit comments

Comments
 (0)