Skip to content

Commit 1b4197d

Browse files
committed
[cxx-interop] Move C++ standard library overlay to the toolchain
The `swiftCxx` and `swiftstd` modules are currently a part of the SDK, but they should be a part of the toolchain instead. rdar://103082278
1 parent c5a7eff commit 1b4197d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

stdlib/public/Cxx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_swift_target_library(swiftCxx ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVE
99
-Xcc -nostdinc++
1010

1111
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
12-
INSTALL_IN_COMPONENT sdk-overlay)
12+
INSTALL_IN_COMPONENT compiler)
1313

1414
add_subdirectory(std)
1515
add_subdirectory(cxxshim)

stdlib/public/Cxx/std/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,5 @@ add_swift_target_library(swiftstd ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVE
147147

148148
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
149149
TARGET_SDKS ALL_APPLE_PLATFORMS LINUX
150-
INSTALL_IN_COMPONENT sdk-overlay
150+
INSTALL_IN_COMPONENT compiler
151151
DEPENDS libstdcxx-modulemap)

0 commit comments

Comments
 (0)