Skip to content

Commit 151c205

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 e25d6a0 commit 151c205

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
@@ -15,7 +15,7 @@ add_swift_target_library(swiftCxx ${SWIFT_CXX_LIBRARY_KIND} NO_LINK_NAME IS_STDL
1515
-Xcc -nostdinc++
1616

1717
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
18-
INSTALL_IN_COMPONENT sdk-overlay
18+
INSTALL_IN_COMPONENT compiler
1919
INSTALL_WITH_SHARED)
2020

2121
add_subdirectory(std)

stdlib/public/Cxx/std/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,6 @@ add_swift_target_library(swiftstd STATIC NO_LINK_NAME IS_STDLIB
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
INSTALL_WITH_SHARED
152152
DEPENDS libstdcxx-modulemap)

0 commit comments

Comments
 (0)