Skip to content

Commit 06f0d2f

Browse files
committed
Handle static-stdlib-args.lnk same as upstream
1 parent b080d4d commit 06f0d2f

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

stdlib/public/runtime/CMakeLists.txt

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -371,22 +371,24 @@ ${libicu_data_a}
371371
DESTINATION "lib/swift_static/${lowercase_sdk}"
372372
COMPONENT stdlib)
373373
elseif("${sdk}" STREQUAL "WASI")
374-
set(linkfile_src "${SWIFT_SOURCE_DIR}/utils/webassembly/static-stdlib-args.lnk")
375374
set(linkfile "${lowercase_sdk}/static-stdlib-args.lnk")
376-
add_custom_command_target(swift_static_stdlib_${sdk}_args
377-
COMMAND
378-
"${CMAKE_COMMAND}" -E copy
379-
"${linkfile_src}"
380-
"${SWIFTSTATICLIB_DIR}/${linkfile}"
381-
OUTPUT
382-
"${SWIFTSTATICLIB_DIR}/${linkfile}"
383-
DEPENDS
384-
"${linkfile_src}")
375+
file(WRITE "${SWIFTSTATICLIB_DIR}/${linkfile}" "
376+
-ldl
377+
-latomic
378+
-lswiftWasiPthread
379+
-lswiftCore
380+
-lswiftImageInspectionShared
381+
-licuuc
382+
-licudata
383+
-lstdc++
384+
-lm
385+
-Xlinker --exclude-libs
386+
-Xlinker ALL")
385387

386-
list(APPEND static_stdlib_lnk_file_list ${swift_static_stdlib_${sdk}_args})
387388
swift_install_in_component(FILES "${SWIFTSTATICLIB_DIR}/${linkfile}"
388389
DESTINATION "lib/swift_static/${lowercase_sdk}"
389390
COMPONENT stdlib)
391+
390392
set(swift_icu_libs_wasi_list)
391393
set(icu_modules UC I18N DATA)
392394
foreach(module IN LISTS icu_modules)

utils/webassembly/static-stdlib-args.lnk

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)