diff options
| author | AlexSm <alex@ydb.tech> | 2024-01-18 11:28:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-18 11:28:56 +0100 |
| commit | 9d0a3761b3201e0d9db879a7adf91876ebdb0564 (patch) | |
| tree | 541d11ac878c18efd7ebca81e35112aa0fef995b /build/ymake.core.conf | |
| parent | 404ef8886ecc9736bc58ade6da2fbd83b486a408 (diff) | |
| download | ydb-9d0a3761b3201e0d9db879a7adf91876ebdb0564.tar.gz | |
Library import 8 (#1074)
* Library import 8
* Add contrib/libs/cxxsupp/libcxx/include/__verbose_abort
Diffstat (limited to 'build/ymake.core.conf')
| -rw-r--r-- | build/ymake.core.conf | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf index e16ce95cf4..6b8e31642f 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -9,7 +9,7 @@ FAKEID=628318530716 SANDBOX_FAKEID=${FAKEID}.7600000 -CPP_FAKEID=2023-12-06 +CPP_FAKEID=2023-12-07 GO_FAKEID=11100371 ANDROID_FAKEID=2023-05-17 CLANG_TIDY_FAKEID=2023-06-06 @@ -308,11 +308,6 @@ otherwise { } } -# tag:linux-specific -when ($OS_LINUX && $OS_SDK == "ubuntu-14" && $MUSL != "yes") { - USE_UBUNTU_COMPATIBILITY=yes -} - USE_ARCADIA_PYTHON=yes USE_ARCADIA_LIBM=no USE_EAT_MY_DATA=no @@ -702,18 +697,6 @@ module _BASE_UNIT: _BARE_UNIT { PEERDIR+=contrib/libs/linux-headers } - # Adding PEERDIR from trigger doesn't always work. In this case it - # cause troubles in contrib/libs/libc_compat/ubuntu_14 under musl - # Workaround this issue by setting variable with PEERDIR in trigger - # and then adding PEERDIR to it's value unconditionally. - when ($USE_UBUNTU_COMPATIBILITY == "yes" && $NEED_PLATFORM_PEERDIRS == "yes") { - _UBUNTU_COMPAT_PEERDIR=contrib/libs/libc_compat/ubuntu_14 - } - otherwise { - _UBUNTU_COMPAT_PEERDIR= - } - PEERDIR+=$_UBUNTU_COMPAT_PEERDIR - when ($NORUNTIME != "yes") { PEERDIR+=contrib/libs/cxxsupp when ($MAPSMOBI_BUILD_TARGET == "yes") { @@ -845,11 +828,16 @@ when ($COMMON_LINK_SETTINGS == "yes") { MODULE_LICENSES_RESTRICTION_EXCEPTIONS+=contrib/libs/libeatmydata } - when ($USE_ARCADIA_LIBM == "yes") { - PEERDIR+=contrib/libs/libm + when ($OS_EMSCRIPTEN == "yes") { + # Do nothing. } - when ($USE_ARCADIA_LIBM == "no") { - C_SYSTEM_LIBRARIES+=-lm + otherwise { + when ($USE_ARCADIA_LIBM == "yes") { + PEERDIR+=contrib/libs/libm + } + when ($USE_ARCADIA_LIBM == "no") { + C_SYSTEM_LIBRARIES+=-lm + } } when (($MUSL != "yes" && $WITH_VALGRIND == "yes") || $SANITIZER_DEFINED == "yes") { @@ -1771,10 +1759,6 @@ module _LIBRARY: _BASE_UNIT { # https://st.yandex-team.ru/DTCC-1227 CFLAGS+=-fdebug-default-version=4 } - - when ($USE_ARCADIA_LIBM == "yes") { - PEERDIR+=contrib/libs/libm - } } CPP_LIBRARY_INDUCED_SEM_PROPERTY=consumer_link_library |