Skip to content

Commit a8d57e2

Browse files
committed
Fix root cause of duplicated SDK targets
Drop deduplication of such lists so to surface configuration errors earlier.
1 parent 3465354 commit a8d57e2

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

stdlib/cmake/modules/AddSwiftStdlib.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,6 @@ function(add_swift_target_library name)
16891689
set(SWIFTLIB_TARGET_SDKS ${SWIFT_SDKS})
16901690
endif()
16911691
list_replace(SWIFTLIB_TARGET_SDKS ALL_APPLE_PLATFORMS "${SWIFT_DARWIN_PLATFORMS}")
1692-
list(REMOVE_DUPLICATES SWIFTLIB_TARGET_SDKS)
16931692

16941693
# All Swift code depends on the standard library, except for the standard
16951694
# library itself.

stdlib/public/Platform/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if(SWIFT_ENABLE_REFLECTION)
1717
endif()
1818

1919
set(swiftDarwin_target_sdks ALL_APPLE_PLATFORMS)
20-
if(SWIFT_FREESTANDING_FLAVOR STREQUAL "apple")
20+
if(SWIFT_FREESTANDING_FLAVOR STREQUAL "apple" AND NOT SWIFT_FREESTANDING_IS_DARWIN)
2121
set(swiftDarwin_target_sdks ALL_APPLE_PLATFORMS FREESTANDING)
2222
endif()
2323

0 commit comments

Comments
 (0)