Ydb stable 22-4-2122.4.21

x-stable-origin-commit: e89099581237299a132feafb5b58af59ebd0468a

5 files changed, 15 insertions, 41 deletions

diff --git a/contrib/libs/tcmalloc/CMakeLists.darwin.txt b/contrib/libs/tcmalloc/CMakeLists.darwin.txt
new file mode 100644
index 0000000000..7898448e35
--- /dev/null
+++ b/contrib/libs/tcmalloc/CMakeLists.darwin.txt
@@ -0,0 +1,9 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(malloc_extension)
diff --git a/contrib/libs/tcmalloc/CMakeLists.linux.txt b/contrib/libs/tcmalloc/CMakeLists.linux.txt
index 8f96b977ae..51a7593d3c 100644
--- a/contrib/libs/tcmalloc/CMakeLists.linux.txt
+++ b/contrib/libs/tcmalloc/CMakeLists.linux.txt
@@ -6,6 +6,8 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(malloc_extension)
+add_subdirectory(no_percpu_cache)
 
 add_library(contrib-libs-tcmalloc)
 target_compile_options(contrib-libs-tcmalloc PRIVATE
diff --git a/contrib/libs/tcmalloc/CMakeLists.txt b/contrib/libs/tcmalloc/CMakeLists.txt
index e8c98bfd99..dbfe6fa2c4 100644
--- a/contrib/libs/tcmalloc/CMakeLists.txt
+++ b/contrib/libs/tcmalloc/CMakeLists.txt
@@ -6,6 +6,8 @@
 # original buildsystem will not be accepted.
 
 
-if (UNIX AND NOT APPLE)
+if (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
   include(CMakeLists.linux.txt)
 endif()
diff --git a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt
index e8c98bfd99..97368e369c 100644
--- a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt
+++ b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt
@@ -6,6 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-if (UNIX AND NOT APPLE)
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
   include(CMakeLists.linux.txt)
 endif()
diff --git a/contrib/libs/tcmalloc/ya.make b/contrib/libs/tcmalloc/ya.make
deleted file mode 100644
index b2e00ef0b7..0000000000
--- a/contrib/libs/tcmalloc/ya.make
+++ /dev/null
@@ -1,39 +0,0 @@
-LIBRARY()
-
-LICENSE(Apache-2.0)
-
-LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-
-OWNER(
-    ayles
-    prime
-    g:cpp-contrib
-)
-
-# https://github.com/google/tcmalloc
-VERSION(2021-10-04-45c59ccbc062ac96d83710205033c656e490d376)
-
-SRCS(
-    # Options
-    tcmalloc/want_hpaa.cc
-)
-
-INCLUDE(common.inc)
-
-CFLAGS(
-    -DTCMALLOC_256K_PAGES
-)
-
-END()
-
-IF (NOT DLL_FOR)
-    RECURSE(
-        default
-        dynamic
-        malloc_extension
-        no_percpu_cache
-        numa_256k
-        numa_large_pages
-        small_but_slow
-    )
-ENDIF()