aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2024-09-16 18:50:05 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2024-09-16 19:33:49 +0300
commitae1941f90d70deb5d720833355e93d89f4ae38cc (patch)
tree9197762c858006c8d2bf83dd3477631138f8bb85 /contrib
parent62bca5194267cb7a3ebad59cf75224fcb4d82188 (diff)
downloadydb-ae1941f90d70deb5d720833355e93d89f4ae38cc.tar.gz
Intermediate changes
commit_hash:503523a79a045cedb35b8d04ea71b3fd4012c390
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libs/cxxsupp/libcxxabi/ya.make9
-rw-r--r--contrib/libs/libunwind/ya.make14
2 files changed, 19 insertions, 4 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()