Skip to content

Commit e144f60

Browse files
committed
[cxx-interop] Migrate to overlay the new compiler flag
`-enable-experimental-cxx-interop` is deprecated, the new flag for enabling C++ interop is `-cxx-interoperability-mode=enabled`. NFC intended.
1 parent 126022f commit e144f60

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
@@ -19,7 +19,7 @@ add_swift_target_library(swiftCxx STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_ONLY IS
1919
UnsafeCxxIterators.swift
2020

2121
SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
22-
-Xfrontend -enable-experimental-cxx-interop
22+
-cxx-interoperability-mode=default
2323
# This module should not pull in the C++ standard library, so we disable it explicitly.
2424
# For functionality that depends on the C++ stdlib, use C++ stdlib overlay (`swiftstd` module).
2525
-Xcc -nostdinc++

stdlib/public/Cxx/std/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O
4545
SWIFT_MODULE_DEPENDS_MACCATALYST ${swift_cxxstdlib_darwin_dependencies}
4646

4747
SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
48-
-Xfrontend -enable-experimental-cxx-interop
48+
-cxx-interoperability-mode=default
4949
-Xfrontend -module-interface-preserve-types-as-written
5050

5151
SWIFT_COMPILE_FLAGS_LINUX

0 commit comments

Comments
 (0)