Skip to content

Commit 568b2f7

Browse files
committed
Revert "[cxx-interop] Do not install binary .swiftmodule files for the overlays"
This reverts commit 16b2808.
1 parent c31341d commit 568b2f7

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

stdlib/cmake/modules/SwiftSource.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -749,9 +749,7 @@ function(_compile_swift_files
749749
endif()
750750

751751
set(exclude_binary_swiftmodule_installation_args "")
752-
if(NOT SWIFTFILE_INSTALL_BINARY_SWIFTMODULE OR
753-
(SWIFTFILE_INSTALL_BINARY_SWIFTMODULE STREQUAL "NON_DARWIN_ONLY" AND
754-
SWIFTFILE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS))
752+
if(NOT SWIFTFILE_INSTALL_BINARY_SWIFTMODULE)
755753
list(APPEND
756754
exclude_binary_swiftmodule_installation_args
757755
"REGEX" "${SWIFTFILE_MODULE_NAME}.swiftmodule/[^/]*\\.swiftmodule$" EXCLUDE)

stdlib/public/Cxx/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ add_swift_target_library(swiftCxx STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY
3939
DEPENDS ${SWIFT_CXX_DEPS}
4040
MACCATALYST_BUILD_FLAVOR zippered
4141
INSTALL_IN_COMPONENT compiler
42-
INSTALL_BINARY_SWIFTMODULE NON_DARWIN_ONLY
4342
INSTALL_WITH_SHARED)
4443

4544
add_subdirectory(libstdcxx)

stdlib/public/Cxx/std/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,5 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O
8181
TARGET_SDKS ALL_APPLE_PLATFORMS LINUX WINDOWS ANDROID
8282
MACCATALYST_BUILD_FLAVOR zippered
8383
INSTALL_IN_COMPONENT compiler
84-
INSTALL_BINARY_SWIFTMODULE NON_DARWIN_ONLY
8584
INSTALL_WITH_SHARED
8685
DEPENDS libstdcxx-modulemap libcxxshim_modulemap CxxStdlib-apinotes)

0 commit comments

Comments
 (0)