Skip to content

Commit e025a49

Browse files
committed
[interop] NFC, test, drop libcxx-in-sdk requirement
CI is running with SDKs that have libc++ already
1 parent 4ceec83 commit e025a49

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

test/Interop/Cxx/stdlib/print-libcxx-module-interface.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// RUN: %target-swift-ide-test -print-module -module-to-print=CxxStdlib -source-filename=x -enable-experimental-cxx-interop -enable-objc-interop -module-print-submodules | %FileCheck %s
22

33
// REQUIRES: OS=macosx
4-
// REQUIRES: libcxx-in-sdk
54

65
// CHECK: enum std {
76
// CHECK-NEXT: enum __1 {

test/Interop/Cxx/symbolic-imports/print-libcxx-symbolic-module-interface.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
// REQUIRES: asserts
44
// REQUIRES: OS=macosx
5-
// REQUIRES: libcxx-in-sdk
65

76
// CHECK: enum std {
87
// CHECK-NEXT: enum __1 {

test/Interop/lit.local.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ clang_opt = clang_compile_opt
1212
is_cf_options_interop_updated = True
1313

1414
if config.variant_sdk and config.variant_sdk != "":
15-
# Check if libc++ is present in the SDK or not.
16-
if config.target_sdk_libcxx_path and os.path.exists(config.target_sdk_libcxx_path):
17-
config.available_features.add('libcxx-in-sdk')
18-
config.substitutions.insert(0, ('%libcxx-in-sdk-path', config.target_sdk_libcxx_path))
19-
2015
# Check if CF_OPTIONS macro has been updated to be imported into Swift in C++ mode correctly.
2116
cf_avail_path = os.path.join(config.variant_sdk, 'System', 'Library', 'Frameworks', 'CoreFoundation.framework', 'Versions', 'A', 'Headers', 'CFAvailability.h')
2217
cf_avail_path_embedded = os.path.join(config.variant_sdk, 'System', 'Library', 'Frameworks', 'CoreFoundation.framework', 'Headers', 'CFAvailability.h')

0 commit comments

Comments
 (0)