Skip to content

Commit dcb60ab

Browse files
committed
[embedded] Build even -macos Embedded Concurrency as THREADING=none, update dependency list
1 parent a79e434 commit dcb60ab

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

stdlib/public/Concurrency/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,6 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
227227
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
228228
set(SWIFT_SDK_embedded_ARCH_${mod}_TRIPLE "${triple}")
229229

230-
if("${mod}" MATCHES "-macos$")
231-
set(SWIFT_SDK_embedded_THREADING_PACKAGE darwin)
232-
endif()
233-
234230
add_swift_target_library_single(
235231
embedded-concurrency-${mod}
236232
swift_Concurrency

test/embedded/dependencies-concurrency.swift

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// Fail if there is any entry in actual-dependencies.txt that's not in allowed-dependencies.txt
1010
// RUN: test -z "`comm -13 %t/allowed-dependencies.txt %t/actual-dependencies.txt`"
1111

12-
// DEP: __ZNSt3__111this_thread9sleep_forERKNS_6chrono8durationIxNS_5ratioILl1ELl1000000000EEEEE
1312
// DEP: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendEPKc
1413
// DEP: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendEPKcm
1514
// DEP: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6insertEmPKc
@@ -20,12 +19,12 @@
2019
// DEP: __ZdlPv
2120
// DEP: __Znwm
2221
// DEP: ___assert_rtn
22+
// DEP: ___error
2323
// DEP: ___stack_chk_fail
2424
// DEP: ___stack_chk_guard
2525
// DEP: ___stderrp
2626
// DEP: __availability_version_check
2727
// DEP: _abort
28-
// DEP: _asl_log
2928
// DEP: _dispatch_once_f
3029
// DEP: _dlsym
3130
// DEP: _exit
@@ -37,15 +36,9 @@
3736
// DEP: _fseek
3837
// DEP: _ftell
3938
// DEP: _malloc
40-
// DEP: _memcpy
4139
// DEP: _memset_s
42-
// DEP: _os_unfair_lock_lock
43-
// DEP: _os_unfair_lock_unlock
40+
// DEP: _nanosleep
4441
// DEP: _posix_memalign
45-
// DEP: _pthread_equal
46-
// DEP: _pthread_getspecific
47-
// DEP: _pthread_self
48-
// DEP: _pthread_setspecific
4942
// DEP: _putchar
5043
// DEP: _rewind
5144
// DEP: _sscanf

0 commit comments

Comments
 (0)