diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2025-03-04 13:27:53 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2025-03-04 13:27:53 +0000 |
| commit | ad0b83372abbcedc2887412cfdd967ea22b7148e (patch) | |
| tree | d24fee47ed2aef834af220ac137f5a0e26ed4678 /build/ymake.core.conf | |
| parent | 31ac77ec345d18126d79b7797bef365c9068d999 (diff) | |
| parent | 040bd4000eeec19eab31a023f72c3c06494ce92d (diff) | |
| download | ydb-ad0b83372abbcedc2887412cfdd967ea22b7148e.tar.gz | |
Merge pull request #15226 from ydb-platform/merge-libs-250302-1120
Diffstat (limited to 'build/ymake.core.conf')
| -rw-r--r-- | build/ymake.core.conf | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 1ed20b6aab..b96a5a412b 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -487,8 +487,13 @@ macro CHECK_DEPENDENT_DIRS(TYPE, ALL?"UNUSED":"", PEERDIRS?"PEERDIRS":"ALL", RES SET_APPEND(CHECK_DEPENDENT_DIRS_TYPES $TYPE) } +macro _HASH_HELPER(Args...) { + .CMD=${hash:Args} + .SEM=${hash:Args} +} + macro _RESOURCE_SEM(INPUTS[], KEYS[], OPTS[]) { - SET(RESOURCE_OUTPUT ${hash:INPUTS}.cpp) + SET(RESOURCE_OUTPUT $_HASH_HELPER($INPUTS $KEYS $OPTS).cpp) .SEM=target_macroses-ITEM && target_macroses-macro resources && target_macroses-args ${output;global:RESOURCE_OUTPUT} INPUTS ${input:INPUTS} KEYS $KEYS OPTS $OPTS ${hide;tool:"tools/rescompiler/bin"} } @@ -775,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 } } |