diff options
| -rw-r--r-- | build/sysincl/emscripten.yml | 3 | ||||
| -rw-r--r-- | build/ymake.core.conf | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/build/sysincl/emscripten.yml b/build/sysincl/emscripten.yml index 2ac68cc16c3..8c637abebe0 100644 --- a/build/sysincl/emscripten.yml +++ b/build/sysincl/emscripten.yml @@ -108,6 +108,9 @@ - contrib/restricted/emscripten/system/lib/libc/musl/src/internal/syscall.h - contrib/restricted/emscripten/system/lib/libc/musl/arch/emscripten/bits/syscall.h + - syscall_arch.h: + - contrib/restricted/emscripten/system/lib/libc/musl/arch/emscripten/syscall_arch.h + - inttypes.h: contrib/restricted/emscripten/system/lib/libc/musl/include/inttypes.h - stddef.h: contrib/restricted/emscripten/system/lib/libc/musl/include/stddef.h - stdint.h: contrib/restricted/emscripten/system/lib/libc/musl/include/stdint.h diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 95c637803f6..b96a5a412b6 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -780,9 +780,15 @@ module _BASE_UNIT: _BARE_UNIT { when ($OS_EMSCRIPTEN == "yes") { when ($NOLIBC != "yes") { PEERDIR+=contrib/restricted/emscripten/include + # Important: In arcadia we usually build standalone WASM applications, + # so standalone library must go before lib/c in linker command-line. + # Emscripten uses two weak definitions for __clock_gettime function, + # so linker will pick one from the first library present in command + # line. + PEERDIR+=contrib/restricted/emscripten/system/lib/standalonewasm + PEERDIR+=contrib/restricted/emscripten/system/lib/stubs PEERDIR+=contrib/restricted/emscripten/system/lib/c PEERDIR+=contrib/restricted/emscripten/system/lib/dlmalloc - PEERDIR+=contrib/restricted/emscripten/system/lib/standalonewasm } } |