Skip to content

Commit 8cf4d3b

Browse files
committed
[cxx-interop] Disable cxxshim on windows until we can figure out cmakeconfig.
1 parent 3805828 commit 8cf4d3b

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

stdlib/public/Cxx/cxxshim/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
is_sdk_requested(WINDOWS swift_build_windows)
12
set(libcxxshim_modulemap_target_list)
23
foreach(sdk ${SWIFT_SDKS})
4+
if(swift_build_windows)
5+
continue()
6+
endif()
7+
38
foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
49
set(arch_suffix "${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
510
set(arch_subdir "${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}")

test/Interop/Cxx/class/inheritance/functions.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop)
22
//
33
// REQUIRES: executable_test
4+
// TODO: Fix CxxShim for Windows.
5+
// XFAIL: OS=windows-msvc
46

57
import StdlibUnittest
68
import CxxShim

test/Interop/Cxx/operators/member-inline.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
2-
2+
//
33
// REQUIRES: executable_test
4+
// TODO: Fix CxxShim for Windows.
5+
// XFAIL: OS=windows-msvc
46

57
import MemberInline
68
import CxxShim

0 commit comments

Comments
 (0)