diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake index a7893dfec0f73..89f2366bdcf4a 100644 --- a/stdlib/cmake/modules/SwiftSource.cmake +++ b/stdlib/cmake/modules/SwiftSource.cmake @@ -746,7 +746,9 @@ function(_compile_swift_files endif() set(exclude_binary_swiftmodule_installation_args "") - if(NOT SWIFTFILE_INSTALL_BINARY_SWIFTMODULE) + if(NOT SWIFTFILE_INSTALL_BINARY_SWIFTMODULE OR + (SWIFTFILE_INSTALL_BINARY_SWIFTMODULE STREQUAL "NON_DARWIN_ONLY" AND + SWIFTFILE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)) list(APPEND exclude_binary_swiftmodule_installation_args "REGEX" "${SWIFTFILE_MODULE_NAME}.swiftmodule/[^/]*\\.swiftmodule$" EXCLUDE) diff --git a/stdlib/public/Cxx/CMakeLists.txt b/stdlib/public/Cxx/CMakeLists.txt index 7459fc0cd8be3..859325adfbfef 100644 --- a/stdlib/public/Cxx/CMakeLists.txt +++ b/stdlib/public/Cxx/CMakeLists.txt @@ -39,6 +39,7 @@ add_swift_target_library(swiftCxx STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY DEPENDS ${SWIFT_CXX_DEPS} MACCATALYST_BUILD_FLAVOR zippered INSTALL_IN_COMPONENT compiler + INSTALL_BINARY_SWIFTMODULE NON_DARWIN_ONLY INSTALL_WITH_SHARED) add_subdirectory(libstdcxx) diff --git a/stdlib/public/Cxx/std/CMakeLists.txt b/stdlib/public/Cxx/std/CMakeLists.txt index 75be5b5289305..beb48d7190a4a 100644 --- a/stdlib/public/Cxx/std/CMakeLists.txt +++ b/stdlib/public/Cxx/std/CMakeLists.txt @@ -81,5 +81,6 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O TARGET_SDKS ALL_APPLE_PLATFORMS LINUX WINDOWS ANDROID MACCATALYST_BUILD_FLAVOR zippered INSTALL_IN_COMPONENT compiler + INSTALL_BINARY_SWIFTMODULE NON_DARWIN_ONLY INSTALL_WITH_SHARED DEPENDS libstdcxx-modulemap libcxxshim_modulemap CxxStdlib-apinotes)