diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2024-09-16 18:50:05 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2024-09-16 19:33:49 +0300 |
| commit | ae1941f90d70deb5d720833355e93d89f4ae38cc (patch) | |
| tree | 9197762c858006c8d2bf83dd3477631138f8bb85 | |
| parent | 62bca5194267cb7a3ebad59cf75224fcb4d82188 (diff) | |
| download | ydb-ae1941f90d70deb5d720833355e93d89f4ae38cc.tar.gz | |
Intermediate changes
commit_hash:503523a79a045cedb35b8d04ea71b3fd4012c390
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/ya.make | 9 | ||||
| -rw-r--r-- | contrib/libs/libunwind/ya.make | 14 | ||||
| -rw-r--r-- | yt/yt/core/ytree/unittests/yson_struct_ut.cpp | 3 |
3 files changed, 19 insertions, 7 deletions
diff --git a/contrib/libs/cxxsupp/libcxxabi/ya.make b/contrib/libs/cxxsupp/libcxxabi/ya.make index 6415d12c99..c886b0d76d 100644 --- a/contrib/libs/cxxsupp/libcxxabi/ya.make +++ b/contrib/libs/cxxsupp/libcxxabi/ya.make @@ -1,4 +1,4 @@ -# Generated by devtools/yamaker from nixpkgs 24.05. +# Generated by devtools/yamaker from nixpkgs 23.11. LIBRARY() @@ -62,7 +62,12 @@ SRC_C_PIC( -fno-lto ) -IF (OS_EMSCRIPTEN) +IF (OS_EMSCRIPTEN AND ARCH_WASM32) + CFLAGS( + -D_LIBCPP_SAFE_STATIC= + -D_LIBCXXABI_DTOR_FUNC= + ) +ELSEIF (OS_EMSCRIPTEN AND NOT ARCH_WASM32) CFLAGS( -D_LIBCPP_SAFE_STATIC= -D_LIBCXXABI_DTOR_FUNC= diff --git a/contrib/libs/libunwind/ya.make b/contrib/libs/libunwind/ya.make index e21c1bab9d..6c2be18942 100644 --- a/contrib/libs/libunwind/ya.make +++ b/contrib/libs/libunwind/ya.make @@ -61,17 +61,27 @@ IF (NOT OS_EMSCRIPTEN) src/UnwindRegistersSave.S src/libunwind.cpp ) -ELSEIF (OS_EMSCRIPTEN) +ELSEIF (OS_EMSCRIPTEN AND ARCH_WASM32) PEERDIR( contrib/restricted/emscripten/include ) CFLAGS( - -D__USING_WASM_EXCEPTIONS__ -D_LIBUNWIND_HIDE_SYMBOLS ) SRCS( src/Unwind-wasm.c ) +ELSEIF (OS_EMSCRIPTEN AND NOT ARCH_WASM32) + PEERDIR( + contrib/restricted/emscripten/include + ) + CFLAGS( + -D_LIBUNWIND_HIDE_SYMBOLS + -D__USING_WASM_EXCEPTIONS__ + ) + SRCS( + src/Unwind-wasm.c + ) ENDIF() END() diff --git a/yt/yt/core/ytree/unittests/yson_struct_ut.cpp b/yt/yt/core/ytree/unittests/yson_struct_ut.cpp index 95ec07ab8c..d1dc7fbab6 100644 --- a/yt/yt/core/ytree/unittests/yson_struct_ut.cpp +++ b/yt/yt/core/ytree/unittests/yson_struct_ut.cpp @@ -2235,9 +2235,6 @@ TEST(TYsonStructTest, CustomSubStruct) //////////////////////////////////////////////////////////////////////////////// -// NB: Currently TYsonStructLite cannot be used as a field in another config as is. -// Thus test below uses std::optional + MergeStrategy::Combine instead of plain struct. - class TTestSubConfigLiteWithDefaults : public TYsonStructLite { |