Skip to content

Commit 59ff6b4

Browse files
authored
Merge pull request #3469 from swiftwasm/katei/fix-missing-concurrency-link
StdlibUnittest: import _Concurrency explicitly
2 parents fa52ea4 + c1e4083 commit 59ff6b4

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

stdlib/private/StdlibUnittest/StdlibUnittest.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ import WinSDK
3535
import ObjectiveC
3636
#endif
3737

38+
#if SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY
39+
import _Concurrency
40+
#endif
41+
3842
#if os(WASI)
3943
let platformSupportSpawnChild = false
4044
#else

test/lit.cfg

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,13 +1581,6 @@ elif run_os == 'wasi':
15811581
'-target', config.variant_triple,
15821582
'-Xcc', '--sysroot=%s' % config.variant_sdk,
15831583
'-Xclang-linker', '--sysroot=%s' % config.variant_sdk,
1584-
# workaroud: Even though StdlibUnittest uses _Concurrency,
1585-
# _Concurrency module won't be listed in IMPORTED_MODULE.
1586-
# And -parse-stdlib disables implicit imports, so autolink
1587-
# system is broken when static link & -parse-stdlib & importing _Concurrency.
1588-
# This issue causes link failure that reports there are missing swift_task_XX
1589-
# symbols.
1590-
'-lswift_Concurrency',
15911584
'-toolchain-stdlib-rpath', config.resource_dir_opt,
15921585
mcp_opt, config.swift_test_options,
15931586
config.swift_driver_test_options, swift_execution_tests_extra_flags])

0 commit comments

Comments
 (0)