Skip to content

Commit 2ddadc2

Browse files
authored
Merge pull request #41704 from apple/egorzhdan/no-concurrency-fix
[OSLog] Conditionally remove the dependency on `_Concurrency`
2 parents 931449b + 18ec9b3 commit 2ddadc2

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

stdlib/private/OSLog/CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
set(swift_oslog_darwin_dependencies "")
2+
if (SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)
3+
list(APPEND swift_oslog_darwin_dependencies "_Concurrency")
4+
endif ()
5+
16
add_swift_target_library(swiftOSLogTestHelper
27
IS_SDK_OVERLAY
38
SHARED
@@ -14,10 +19,10 @@ add_swift_target_library(swiftOSLogTestHelper
1419
OSLogPrivacy.swift
1520
OSLogFloatFormatting.swift
1621

17-
SWIFT_MODULE_DEPENDS_IOS Darwin
18-
SWIFT_MODULE_DEPENDS_OSX Darwin
19-
SWIFT_MODULE_DEPENDS_TVOS Darwin
20-
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
22+
SWIFT_MODULE_DEPENDS_IOS Darwin ${swift_oslog_darwin_dependencies}
23+
SWIFT_MODULE_DEPENDS_OSX Darwin ${swift_oslog_darwin_dependencies}
24+
SWIFT_MODULE_DEPENDS_TVOS Darwin ${swift_oslog_darwin_dependencies}
25+
SWIFT_MODULE_DEPENDS_WATCHOS Darwin ${swift_oslog_darwin_dependencies}
2126
TARGET_SDKS ALL_APPLE_PLATFORMS
2227
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
2328
INSTALL_IN_COMPONENT never_install

0 commit comments

Comments
 (0)