Intermediate changes

765 files changed, 509 insertions, 509 deletions

diff --git a/library/cpp/CMakeLists.darwin.txt b/library/cpp/CMakeLists.darwin-x86_64.txt
index 2e5648a15c1..2e5648a15c1 100644
--- a/library/cpp/CMakeLists.darwin.txt
+++ b/library/cpp/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/CMakeLists.linux.txt b/library/cpp/CMakeLists.linux-x86_64.txt
index 2e5648a15c1..2e5648a15c1 100644
--- a/library/cpp/CMakeLists.linux.txt
+++ b/library/cpp/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/CMakeLists.txt b/library/cpp/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/CMakeLists.txt
+++ b/library/cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/accurate_accumulate/CMakeLists.darwin.txt b/library/cpp/accurate_accumulate/CMakeLists.darwin-x86_64.txt
index 6d68faefed9..6d68faefed9 100644
--- a/library/cpp/accurate_accumulate/CMakeLists.darwin.txt
+++ b/library/cpp/accurate_accumulate/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/accurate_accumulate/CMakeLists.linux.txt b/library/cpp/accurate_accumulate/CMakeLists.linux-x86_64.txt
index d168ea5295a..d168ea5295a 100644
--- a/library/cpp/accurate_accumulate/CMakeLists.linux.txt
+++ b/library/cpp/accurate_accumulate/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/accurate_accumulate/CMakeLists.txt b/library/cpp/accurate_accumulate/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/accurate_accumulate/CMakeLists.txt
+++ b/library/cpp/accurate_accumulate/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/core/CMakeLists.darwin.txt b/library/cpp/actors/core/CMakeLists.darwin-x86_64.txt
index 7fe4e2c2ff7..7fe4e2c2ff7 100644
--- a/library/cpp/actors/core/CMakeLists.darwin.txt
+++ b/library/cpp/actors/core/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/core/CMakeLists.linux.txt b/library/cpp/actors/core/CMakeLists.linux-x86_64.txt
index e2a6cc1f08c..e2a6cc1f08c 100644
--- a/library/cpp/actors/core/CMakeLists.linux.txt
+++ b/library/cpp/actors/core/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/core/CMakeLists.txt b/library/cpp/actors/core/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/core/CMakeLists.txt
+++ b/library/cpp/actors/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.darwin.txt b/library/cpp/actors/dnscachelib/CMakeLists.darwin-x86_64.txt
index 539f17a1a2f..539f17a1a2f 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.darwin.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.linux.txt b/library/cpp/actors/dnscachelib/CMakeLists.linux-x86_64.txt
index 03a286a6630..03a286a6630 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.linux.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.txt b/library/cpp/actors/dnscachelib/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.darwin.txt b/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt
index 341f9e7593d..341f9e7593d 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.darwin.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.linux.txt b/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt
index 202d9028bcf..202d9028bcf 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.linux.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.txt b/library/cpp/actors/dnsresolver/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/helpers/CMakeLists.darwin.txt b/library/cpp/actors/helpers/CMakeLists.darwin-x86_64.txt
index 16ecfc7b98c..16ecfc7b98c 100644
--- a/library/cpp/actors/helpers/CMakeLists.darwin.txt
+++ b/library/cpp/actors/helpers/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/helpers/CMakeLists.linux.txt b/library/cpp/actors/helpers/CMakeLists.linux-x86_64.txt
index b00db82fdec..b00db82fdec 100644
--- a/library/cpp/actors/helpers/CMakeLists.linux.txt
+++ b/library/cpp/actors/helpers/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/helpers/CMakeLists.txt b/library/cpp/actors/helpers/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/helpers/CMakeLists.txt
+++ b/library/cpp/actors/helpers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/http/CMakeLists.darwin.txt b/library/cpp/actors/http/CMakeLists.darwin-x86_64.txt
index c60599beaa4..c60599beaa4 100644
--- a/library/cpp/actors/http/CMakeLists.darwin.txt
+++ b/library/cpp/actors/http/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/http/CMakeLists.linux.txt b/library/cpp/actors/http/CMakeLists.linux-x86_64.txt
index d6e3868652a..d6e3868652a 100644
--- a/library/cpp/actors/http/CMakeLists.linux.txt
+++ b/library/cpp/actors/http/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/http/CMakeLists.txt b/library/cpp/actors/http/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/http/CMakeLists.txt
+++ b/library/cpp/actors/http/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/interconnect/CMakeLists.darwin.txt b/library/cpp/actors/interconnect/CMakeLists.darwin-x86_64.txt
index 49ad9e634be..49ad9e634be 100644
--- a/library/cpp/actors/interconnect/CMakeLists.darwin.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/interconnect/CMakeLists.linux.txt b/library/cpp/actors/interconnect/CMakeLists.linux-x86_64.txt
index 255f935cda3..255f935cda3 100644
--- a/library/cpp/actors/interconnect/CMakeLists.linux.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/interconnect/CMakeLists.txt b/library/cpp/actors/interconnect/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/interconnect/CMakeLists.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/interconnect/mock/CMakeLists.darwin.txt b/library/cpp/actors/interconnect/mock/CMakeLists.darwin-x86_64.txt
index c29d87b0ce3..c29d87b0ce3 100644
--- a/library/cpp/actors/interconnect/mock/CMakeLists.darwin.txt
+++ b/library/cpp/actors/interconnect/mock/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/interconnect/mock/CMakeLists.linux.txt b/library/cpp/actors/interconnect/mock/CMakeLists.linux-x86_64.txt
index 85d0cf46964..85d0cf46964 100644
--- a/library/cpp/actors/interconnect/mock/CMakeLists.linux.txt
+++ b/library/cpp/actors/interconnect/mock/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/interconnect/mock/CMakeLists.txt b/library/cpp/actors/interconnect/mock/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/interconnect/mock/CMakeLists.txt
+++ b/library/cpp/actors/interconnect/mock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/log_backend/CMakeLists.darwin.txt b/library/cpp/actors/log_backend/CMakeLists.darwin-x86_64.txt
index 2845e78e353..2845e78e353 100644
--- a/library/cpp/actors/log_backend/CMakeLists.darwin.txt
+++ b/library/cpp/actors/log_backend/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/log_backend/CMakeLists.linux.txt b/library/cpp/actors/log_backend/CMakeLists.linux-x86_64.txt
index 15786d6c742..15786d6c742 100644
--- a/library/cpp/actors/log_backend/CMakeLists.linux.txt
+++ b/library/cpp/actors/log_backend/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/log_backend/CMakeLists.txt b/library/cpp/actors/log_backend/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/log_backend/CMakeLists.txt
+++ b/library/cpp/actors/log_backend/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/memory_log/CMakeLists.darwin.txt b/library/cpp/actors/memory_log/CMakeLists.darwin-x86_64.txt
index 5109f0fcce9..5109f0fcce9 100644
--- a/library/cpp/actors/memory_log/CMakeLists.darwin.txt
+++ b/library/cpp/actors/memory_log/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/memory_log/CMakeLists.linux.txt b/library/cpp/actors/memory_log/CMakeLists.linux-x86_64.txt
index 1fa79db3fff..1fa79db3fff 100644
--- a/library/cpp/actors/memory_log/CMakeLists.linux.txt
+++ b/library/cpp/actors/memory_log/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/memory_log/CMakeLists.txt b/library/cpp/actors/memory_log/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/memory_log/CMakeLists.txt
+++ b/library/cpp/actors/memory_log/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/prof/CMakeLists.darwin.txt b/library/cpp/actors/prof/CMakeLists.darwin-x86_64.txt
index 9ee960950de..9ee960950de 100644
--- a/library/cpp/actors/prof/CMakeLists.darwin.txt
+++ b/library/cpp/actors/prof/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/prof/CMakeLists.linux.txt b/library/cpp/actors/prof/CMakeLists.linux-x86_64.txt
index a7ee6c9586f..a7ee6c9586f 100644
--- a/library/cpp/actors/prof/CMakeLists.linux.txt
+++ b/library/cpp/actors/prof/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/prof/CMakeLists.txt b/library/cpp/actors/prof/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/prof/CMakeLists.txt
+++ b/library/cpp/actors/prof/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/protos/CMakeLists.darwin.txt b/library/cpp/actors/protos/CMakeLists.darwin-x86_64.txt
index be3257b1276..be3257b1276 100644
--- a/library/cpp/actors/protos/CMakeLists.darwin.txt
+++ b/library/cpp/actors/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/protos/CMakeLists.linux.txt b/library/cpp/actors/protos/CMakeLists.linux-x86_64.txt
index a9da706400f..a9da706400f 100644
--- a/library/cpp/actors/protos/CMakeLists.linux.txt
+++ b/library/cpp/actors/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/protos/CMakeLists.txt b/library/cpp/actors/protos/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/protos/CMakeLists.txt
+++ b/library/cpp/actors/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/testlib/CMakeLists.darwin.txt b/library/cpp/actors/testlib/CMakeLists.darwin-x86_64.txt
index 1508c82e9bc..1508c82e9bc 100644
--- a/library/cpp/actors/testlib/CMakeLists.darwin.txt
+++ b/library/cpp/actors/testlib/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/testlib/CMakeLists.linux.txt b/library/cpp/actors/testlib/CMakeLists.linux-x86_64.txt
index 68cb3d3199f..68cb3d3199f 100644
--- a/library/cpp/actors/testlib/CMakeLists.linux.txt
+++ b/library/cpp/actors/testlib/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/testlib/CMakeLists.txt b/library/cpp/actors/testlib/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/testlib/CMakeLists.txt
+++ b/library/cpp/actors/testlib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/util/CMakeLists.darwin.txt b/library/cpp/actors/util/CMakeLists.darwin-x86_64.txt
index 2bac6f5b8a8..2bac6f5b8a8 100644
--- a/library/cpp/actors/util/CMakeLists.darwin.txt
+++ b/library/cpp/actors/util/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/util/CMakeLists.linux.txt b/library/cpp/actors/util/CMakeLists.linux-x86_64.txt
index 9eebd23475b..9eebd23475b 100644
--- a/library/cpp/actors/util/CMakeLists.linux.txt
+++ b/library/cpp/actors/util/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/util/CMakeLists.txt b/library/cpp/actors/util/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/util/CMakeLists.txt
+++ b/library/cpp/actors/util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/wilson/CMakeLists.darwin.txt b/library/cpp/actors/wilson/CMakeLists.darwin-x86_64.txt
index 45704ccd5a2..45704ccd5a2 100644
--- a/library/cpp/actors/wilson/CMakeLists.darwin.txt
+++ b/library/cpp/actors/wilson/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/wilson/CMakeLists.linux.txt b/library/cpp/actors/wilson/CMakeLists.linux-x86_64.txt
index ccc87489aeb..ccc87489aeb 100644
--- a/library/cpp/actors/wilson/CMakeLists.linux.txt
+++ b/library/cpp/actors/wilson/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/wilson/CMakeLists.txt b/library/cpp/actors/wilson/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/wilson/CMakeLists.txt
+++ b/library/cpp/actors/wilson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.darwin.txt b/library/cpp/actors/wilson/protos/CMakeLists.darwin-x86_64.txt
index 5e21c8ffc3b..5e21c8ffc3b 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.darwin.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.linux.txt b/library/cpp/actors/wilson/protos/CMakeLists.linux-x86_64.txt
index d12c55767a5..d12c55767a5 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.linux.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.txt b/library/cpp/actors/wilson/protos/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/archive/CMakeLists.darwin.txt b/library/cpp/archive/CMakeLists.darwin-x86_64.txt
index 37c28ba02a3..37c28ba02a3 100644
--- a/library/cpp/archive/CMakeLists.darwin.txt
+++ b/library/cpp/archive/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/archive/CMakeLists.linux.txt b/library/cpp/archive/CMakeLists.linux-x86_64.txt
index 03631029ddf..03631029ddf 100644
--- a/library/cpp/archive/CMakeLists.linux.txt
+++ b/library/cpp/archive/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/archive/CMakeLists.txt b/library/cpp/archive/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/archive/CMakeLists.txt
+++ b/library/cpp/archive/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/balloc/CMakeLists.darwin.txt b/library/cpp/balloc/CMakeLists.darwin-x86_64.txt
index 08814068d19..08814068d19 100644
--- a/library/cpp/balloc/CMakeLists.darwin.txt
+++ b/library/cpp/balloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/balloc/CMakeLists.linux.txt b/library/cpp/balloc/CMakeLists.linux-x86_64.txt
index 8b703ab6d46..8b703ab6d46 100644
--- a/library/cpp/balloc/CMakeLists.linux.txt
+++ b/library/cpp/balloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/balloc/CMakeLists.txt b/library/cpp/balloc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/balloc/CMakeLists.txt
+++ b/library/cpp/balloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/balloc/lib/CMakeLists.darwin.txt b/library/cpp/balloc/lib/CMakeLists.darwin-x86_64.txt
index 04448766819..04448766819 100644
--- a/library/cpp/balloc/lib/CMakeLists.darwin.txt
+++ b/library/cpp/balloc/lib/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/balloc/lib/CMakeLists.linux.txt b/library/cpp/balloc/lib/CMakeLists.linux-x86_64.txt
index 78dd3d4b903..78dd3d4b903 100644
--- a/library/cpp/balloc/lib/CMakeLists.linux.txt
+++ b/library/cpp/balloc/lib/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/balloc/lib/CMakeLists.txt b/library/cpp/balloc/lib/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/balloc/lib/CMakeLists.txt
+++ b/library/cpp/balloc/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/balloc/setup/CMakeLists.darwin.txt b/library/cpp/balloc/setup/CMakeLists.darwin-x86_64.txt
index 37f588f7f71..37f588f7f71 100644
--- a/library/cpp/balloc/setup/CMakeLists.darwin.txt
+++ b/library/cpp/balloc/setup/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/balloc/setup/CMakeLists.linux.txt b/library/cpp/balloc/setup/CMakeLists.linux-x86_64.txt
index aa604e5d20c..aa604e5d20c 100644
--- a/library/cpp/balloc/setup/CMakeLists.linux.txt
+++ b/library/cpp/balloc/setup/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/balloc/setup/CMakeLists.txt b/library/cpp/balloc/setup/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/balloc/setup/CMakeLists.txt
+++ b/library/cpp/balloc/setup/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/binsaver/CMakeLists.darwin.txt b/library/cpp/binsaver/CMakeLists.darwin-x86_64.txt
index 3430226be1f..3430226be1f 100644
--- a/library/cpp/binsaver/CMakeLists.darwin.txt
+++ b/library/cpp/binsaver/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/binsaver/CMakeLists.linux.txt b/library/cpp/binsaver/CMakeLists.linux-x86_64.txt
index 1a5048d32f5..1a5048d32f5 100644
--- a/library/cpp/binsaver/CMakeLists.linux.txt
+++ b/library/cpp/binsaver/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/binsaver/CMakeLists.txt b/library/cpp/binsaver/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/binsaver/CMakeLists.txt
+++ b/library/cpp/binsaver/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/bit_io/CMakeLists.darwin.txt b/library/cpp/bit_io/CMakeLists.darwin-x86_64.txt
index 3e27b7a8423..3e27b7a8423 100644
--- a/library/cpp/bit_io/CMakeLists.darwin.txt
+++ b/library/cpp/bit_io/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/bit_io/CMakeLists.linux.txt b/library/cpp/bit_io/CMakeLists.linux-x86_64.txt
index 35dab036edc..35dab036edc 100644
--- a/library/cpp/bit_io/CMakeLists.linux.txt
+++ b/library/cpp/bit_io/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/bit_io/CMakeLists.txt b/library/cpp/bit_io/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/bit_io/CMakeLists.txt
+++ b/library/cpp/bit_io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/CMakeLists.darwin.txt b/library/cpp/blockcodecs/CMakeLists.darwin-x86_64.txt
index 3b5f212510a..3b5f212510a 100644
--- a/library/cpp/blockcodecs/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/CMakeLists.linux.txt b/library/cpp/blockcodecs/CMakeLists.linux-x86_64.txt
index 4b750271970..4b750271970 100644
--- a/library/cpp/blockcodecs/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/CMakeLists.txt b/library/cpp/blockcodecs/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/CMakeLists.txt
+++ b/library/cpp/blockcodecs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.darwin-x86_64.txt
index 0af596c5de6..0af596c5de6 100644
--- a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.linux-x86_64.txt
index ccb11a52888..ccb11a52888 100644
--- a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.darwin-x86_64.txt
index fd7180543ce..fd7180543ce 100644
--- a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.linux-x86_64.txt
index cb9bd53db14..cb9bd53db14 100644
--- a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.darwin-x86_64.txt
index 0acda91a4dc..0acda91a4dc 100644
--- a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.linux-x86_64.txt
index 841e41dc333..841e41dc333 100644
--- a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.darwin-x86_64.txt
index c6d20bf8fc5..c6d20bf8fc5 100644
--- a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.linux-x86_64.txt
index e0dbc8de82b..e0dbc8de82b 100644
--- a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.txt b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.darwin-x86_64.txt
index 92e6f5f9db6..92e6f5f9db6 100644
--- a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.linux-x86_64.txt
index 0d4874b329a..0d4874b329a 100644
--- a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.darwin-x86_64.txt
index acaf2f9e8d6..acaf2f9e8d6 100644
--- a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.linux-x86_64.txt
index 0fee0bb18df..0fee0bb18df 100644
--- a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.darwin-x86_64.txt
index 995fd58dfce..995fd58dfce 100644
--- a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.linux-x86_64.txt
index de6eef3de03..de6eef3de03 100644
--- a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin-x86_64.txt
index 2e13dbce8c2..2e13dbce8c2 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-x86_64.txt
index 22fe89535f8..22fe89535f8 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.darwin-x86_64.txt
index 894ad9b9a8b..894ad9b9a8b 100644
--- a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.linux-x86_64.txt
index 46c472e81f8..46c472e81f8 100644
--- a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/core/CMakeLists.darwin.txt b/library/cpp/blockcodecs/core/CMakeLists.darwin-x86_64.txt
index c49c7d01b8f..c49c7d01b8f 100644
--- a/library/cpp/blockcodecs/core/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/core/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/core/CMakeLists.linux.txt b/library/cpp/blockcodecs/core/CMakeLists.linux-x86_64.txt
index 407f8f62e12..407f8f62e12 100644
--- a/library/cpp/blockcodecs/core/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/core/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/core/CMakeLists.txt b/library/cpp/blockcodecs/core/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/blockcodecs/core/CMakeLists.txt
+++ b/library/cpp/blockcodecs/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/bucket_quoter/CMakeLists.darwin.txt b/library/cpp/bucket_quoter/CMakeLists.darwin-x86_64.txt
index 64ef18e5d9f..64ef18e5d9f 100644
--- a/library/cpp/bucket_quoter/CMakeLists.darwin.txt
+++ b/library/cpp/bucket_quoter/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/bucket_quoter/CMakeLists.linux.txt b/library/cpp/bucket_quoter/CMakeLists.linux-x86_64.txt
index 249edbf20a3..249edbf20a3 100644
--- a/library/cpp/bucket_quoter/CMakeLists.linux.txt
+++ b/library/cpp/bucket_quoter/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/bucket_quoter/CMakeLists.txt b/library/cpp/bucket_quoter/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/bucket_quoter/CMakeLists.txt
+++ b/library/cpp/bucket_quoter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/build_info/CMakeLists.darwin.txt b/library/cpp/build_info/CMakeLists.darwin-x86_64.txt
index a749cac8a03..a749cac8a03 100644
--- a/library/cpp/build_info/CMakeLists.darwin.txt
+++ b/library/cpp/build_info/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/build_info/CMakeLists.linux.txt b/library/cpp/build_info/CMakeLists.linux-x86_64.txt
index 7067bdf107c..7067bdf107c 100644
--- a/library/cpp/build_info/CMakeLists.linux.txt
+++ b/library/cpp/build_info/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/build_info/CMakeLists.txt b/library/cpp/build_info/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/build_info/CMakeLists.txt
+++ b/library/cpp/build_info/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/cache/CMakeLists.darwin.txt b/library/cpp/cache/CMakeLists.darwin-x86_64.txt
index 82cae52ee21..82cae52ee21 100644
--- a/library/cpp/cache/CMakeLists.darwin.txt
+++ b/library/cpp/cache/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/cache/CMakeLists.linux.txt b/library/cpp/cache/CMakeLists.linux-x86_64.txt
index 4278ad1c770..4278ad1c770 100644
--- a/library/cpp/cache/CMakeLists.linux.txt
+++ b/library/cpp/cache/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/cache/CMakeLists.txt b/library/cpp/cache/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/cache/CMakeLists.txt
+++ b/library/cpp/cache/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/case_insensitive_string/CMakeLists.darwin.txt b/library/cpp/case_insensitive_string/CMakeLists.darwin-x86_64.txt
index d6d3602e2d2..d6d3602e2d2 100644
--- a/library/cpp/case_insensitive_string/CMakeLists.darwin.txt
+++ b/library/cpp/case_insensitive_string/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/case_insensitive_string/CMakeLists.linux.txt b/library/cpp/case_insensitive_string/CMakeLists.linux-x86_64.txt
index d02118b8f77..d02118b8f77 100644
--- a/library/cpp/case_insensitive_string/CMakeLists.linux.txt
+++ b/library/cpp/case_insensitive_string/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/case_insensitive_string/CMakeLists.txt b/library/cpp/case_insensitive_string/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/case_insensitive_string/CMakeLists.txt
+++ b/library/cpp/case_insensitive_string/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/cgiparam/CMakeLists.darwin.txt b/library/cpp/cgiparam/CMakeLists.darwin-x86_64.txt
index 186d00a9389..186d00a9389 100644
--- a/library/cpp/cgiparam/CMakeLists.darwin.txt
+++ b/library/cpp/cgiparam/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/cgiparam/CMakeLists.linux.txt b/library/cpp/cgiparam/CMakeLists.linux-x86_64.txt
index eec57f881a2..eec57f881a2 100644
--- a/library/cpp/cgiparam/CMakeLists.linux.txt
+++ b/library/cpp/cgiparam/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/cgiparam/CMakeLists.txt b/library/cpp/cgiparam/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/cgiparam/CMakeLists.txt
+++ b/library/cpp/cgiparam/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/charset/CMakeLists.darwin.txt b/library/cpp/charset/CMakeLists.darwin-x86_64.txt
index 2be179087cf..2be179087cf 100644
--- a/library/cpp/charset/CMakeLists.darwin.txt
+++ b/library/cpp/charset/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/charset/CMakeLists.linux.txt b/library/cpp/charset/CMakeLists.linux-x86_64.txt
index b2e97648f9b..b2e97648f9b 100644
--- a/library/cpp/charset/CMakeLists.linux.txt
+++ b/library/cpp/charset/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/charset/CMakeLists.txt b/library/cpp/charset/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/charset/CMakeLists.txt
+++ b/library/cpp/charset/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/codecs/CMakeLists.darwin.txt b/library/cpp/codecs/CMakeLists.darwin-x86_64.txt
index 2bc3133ce1c..2bc3133ce1c 100644
--- a/library/cpp/codecs/CMakeLists.darwin.txt
+++ b/library/cpp/codecs/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/codecs/CMakeLists.linux.txt b/library/cpp/codecs/CMakeLists.linux-x86_64.txt
index e70090edcb2..e70090edcb2 100644
--- a/library/cpp/codecs/CMakeLists.linux.txt
+++ b/library/cpp/codecs/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/codecs/CMakeLists.txt b/library/cpp/codecs/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/codecs/CMakeLists.txt
+++ b/library/cpp/codecs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/codecs/greedy_dict/CMakeLists.darwin.txt b/library/cpp/codecs/greedy_dict/CMakeLists.darwin-x86_64.txt
index 7f06cf83d8a..7f06cf83d8a 100644
--- a/library/cpp/codecs/greedy_dict/CMakeLists.darwin.txt
+++ b/library/cpp/codecs/greedy_dict/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/codecs/greedy_dict/CMakeLists.linux.txt b/library/cpp/codecs/greedy_dict/CMakeLists.linux-x86_64.txt
index 734416a5272..734416a5272 100644
--- a/library/cpp/codecs/greedy_dict/CMakeLists.linux.txt
+++ b/library/cpp/codecs/greedy_dict/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/codecs/greedy_dict/CMakeLists.txt b/library/cpp/codecs/greedy_dict/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/codecs/greedy_dict/CMakeLists.txt
+++ b/library/cpp/codecs/greedy_dict/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/colorizer/CMakeLists.darwin.txt b/library/cpp/colorizer/CMakeLists.darwin-x86_64.txt
index a47c86d7eaa..a47c86d7eaa 100644
--- a/library/cpp/colorizer/CMakeLists.darwin.txt
+++ b/library/cpp/colorizer/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/colorizer/CMakeLists.linux.txt b/library/cpp/colorizer/CMakeLists.linux-x86_64.txt
index d407d96e14e..d407d96e14e 100644
--- a/library/cpp/colorizer/CMakeLists.linux.txt
+++ b/library/cpp/colorizer/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/colorizer/CMakeLists.txt b/library/cpp/colorizer/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/colorizer/CMakeLists.txt
+++ b/library/cpp/colorizer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/compproto/CMakeLists.darwin.txt b/library/cpp/compproto/CMakeLists.darwin-x86_64.txt
index abcc95d486f..abcc95d486f 100644
--- a/library/cpp/compproto/CMakeLists.darwin.txt
+++ b/library/cpp/compproto/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/compproto/CMakeLists.linux.txt b/library/cpp/compproto/CMakeLists.linux-x86_64.txt
index f7c1ee7be78..f7c1ee7be78 100644
--- a/library/cpp/compproto/CMakeLists.linux.txt
+++ b/library/cpp/compproto/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/compproto/CMakeLists.txt b/library/cpp/compproto/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/compproto/CMakeLists.txt
+++ b/library/cpp/compproto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/comptable/CMakeLists.darwin.txt b/library/cpp/comptable/CMakeLists.darwin-x86_64.txt
index e695ca6521a..e695ca6521a 100644
--- a/library/cpp/comptable/CMakeLists.darwin.txt
+++ b/library/cpp/comptable/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/comptable/CMakeLists.linux.txt b/library/cpp/comptable/CMakeLists.linux-x86_64.txt
index d438e07d935..d438e07d935 100644
--- a/library/cpp/comptable/CMakeLists.linux.txt
+++ b/library/cpp/comptable/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/comptable/CMakeLists.txt b/library/cpp/comptable/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/comptable/CMakeLists.txt
+++ b/library/cpp/comptable/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/config/CMakeLists.darwin.txt b/library/cpp/config/CMakeLists.darwin-x86_64.txt
index 23c772e4fc2..23c772e4fc2 100644
--- a/library/cpp/config/CMakeLists.darwin.txt
+++ b/library/cpp/config/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/config/CMakeLists.linux.txt b/library/cpp/config/CMakeLists.linux-x86_64.txt
index 3e91ece220b..3e91ece220b 100644
--- a/library/cpp/config/CMakeLists.linux.txt
+++ b/library/cpp/config/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/config/CMakeLists.txt b/library/cpp/config/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/config/CMakeLists.txt
+++ b/library/cpp/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/2d_array/CMakeLists.darwin.txt b/library/cpp/containers/2d_array/CMakeLists.darwin-x86_64.txt
index c1371c0defe..c1371c0defe 100644
--- a/library/cpp/containers/2d_array/CMakeLists.darwin.txt
+++ b/library/cpp/containers/2d_array/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/2d_array/CMakeLists.linux.txt b/library/cpp/containers/2d_array/CMakeLists.linux-x86_64.txt
index 25140f3dc92..25140f3dc92 100644
--- a/library/cpp/containers/2d_array/CMakeLists.linux.txt
+++ b/library/cpp/containers/2d_array/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/2d_array/CMakeLists.txt b/library/cpp/containers/2d_array/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/2d_array/CMakeLists.txt
+++ b/library/cpp/containers/2d_array/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/absl_flat_hash/CMakeLists.darwin.txt b/library/cpp/containers/absl_flat_hash/CMakeLists.darwin-x86_64.txt
index 4ab79d02db6..4ab79d02db6 100644
--- a/library/cpp/containers/absl_flat_hash/CMakeLists.darwin.txt
+++ b/library/cpp/containers/absl_flat_hash/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/absl_flat_hash/CMakeLists.linux.txt b/library/cpp/containers/absl_flat_hash/CMakeLists.linux-x86_64.txt
index 379fc48361c..379fc48361c 100644
--- a/library/cpp/containers/absl_flat_hash/CMakeLists.linux.txt
+++ b/library/cpp/containers/absl_flat_hash/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/absl_flat_hash/CMakeLists.txt b/library/cpp/containers/absl_flat_hash/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/absl_flat_hash/CMakeLists.txt
+++ b/library/cpp/containers/absl_flat_hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/atomizer/CMakeLists.darwin.txt b/library/cpp/containers/atomizer/CMakeLists.darwin-x86_64.txt
index d0486e1c368..d0486e1c368 100644
--- a/library/cpp/containers/atomizer/CMakeLists.darwin.txt
+++ b/library/cpp/containers/atomizer/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/atomizer/CMakeLists.linux.txt b/library/cpp/containers/atomizer/CMakeLists.linux-x86_64.txt
index 2db431da3fc..2db431da3fc 100644
--- a/library/cpp/containers/atomizer/CMakeLists.linux.txt
+++ b/library/cpp/containers/atomizer/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/atomizer/CMakeLists.txt b/library/cpp/containers/atomizer/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/atomizer/CMakeLists.txt
+++ b/library/cpp/containers/atomizer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/bitseq/CMakeLists.darwin.txt b/library/cpp/containers/bitseq/CMakeLists.darwin-x86_64.txt
index 97b139a7fac..97b139a7fac 100644
--- a/library/cpp/containers/bitseq/CMakeLists.darwin.txt
+++ b/library/cpp/containers/bitseq/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/bitseq/CMakeLists.linux.txt b/library/cpp/containers/bitseq/CMakeLists.linux-x86_64.txt
index 758be4fd4c0..758be4fd4c0 100644
--- a/library/cpp/containers/bitseq/CMakeLists.linux.txt
+++ b/library/cpp/containers/bitseq/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/bitseq/CMakeLists.txt b/library/cpp/containers/bitseq/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/bitseq/CMakeLists.txt
+++ b/library/cpp/containers/bitseq/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/compact_vector/CMakeLists.darwin.txt b/library/cpp/containers/compact_vector/CMakeLists.darwin-x86_64.txt
index 57d3af0a1be..57d3af0a1be 100644
--- a/library/cpp/containers/compact_vector/CMakeLists.darwin.txt
+++ b/library/cpp/containers/compact_vector/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/compact_vector/CMakeLists.linux.txt b/library/cpp/containers/compact_vector/CMakeLists.linux-x86_64.txt
index a2171479e99..a2171479e99 100644
--- a/library/cpp/containers/compact_vector/CMakeLists.linux.txt
+++ b/library/cpp/containers/compact_vector/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/compact_vector/CMakeLists.txt b/library/cpp/containers/compact_vector/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/compact_vector/CMakeLists.txt
+++ b/library/cpp/containers/compact_vector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/comptrie/CMakeLists.darwin.txt b/library/cpp/containers/comptrie/CMakeLists.darwin-x86_64.txt
index 3a3d86aed70..3a3d86aed70 100644
--- a/library/cpp/containers/comptrie/CMakeLists.darwin.txt
+++ b/library/cpp/containers/comptrie/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/comptrie/CMakeLists.linux.txt b/library/cpp/containers/comptrie/CMakeLists.linux-x86_64.txt
index 599cc37088e..599cc37088e 100644
--- a/library/cpp/containers/comptrie/CMakeLists.linux.txt
+++ b/library/cpp/containers/comptrie/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/comptrie/CMakeLists.txt b/library/cpp/containers/comptrie/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/comptrie/CMakeLists.txt
+++ b/library/cpp/containers/comptrie/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/disjoint_interval_tree/CMakeLists.darwin.txt b/library/cpp/containers/disjoint_interval_tree/CMakeLists.darwin-x86_64.txt
index 1fd4597d59a..1fd4597d59a 100644
--- a/library/cpp/containers/disjoint_interval_tree/CMakeLists.darwin.txt
+++ b/library/cpp/containers/disjoint_interval_tree/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/disjoint_interval_tree/CMakeLists.linux.txt b/library/cpp/containers/disjoint_interval_tree/CMakeLists.linux-x86_64.txt
index c62ad5f23cd..c62ad5f23cd 100644
--- a/library/cpp/containers/disjoint_interval_tree/CMakeLists.linux.txt
+++ b/library/cpp/containers/disjoint_interval_tree/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt b/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt
+++ b/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/flat_hash/CMakeLists.darwin.txt b/library/cpp/containers/flat_hash/CMakeLists.darwin-x86_64.txt
index 17eb5a21b78..17eb5a21b78 100644
--- a/library/cpp/containers/flat_hash/CMakeLists.darwin.txt
+++ b/library/cpp/containers/flat_hash/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/flat_hash/CMakeLists.linux.txt b/library/cpp/containers/flat_hash/CMakeLists.linux-x86_64.txt
index d5ab2865c77..d5ab2865c77 100644
--- a/library/cpp/containers/flat_hash/CMakeLists.linux.txt
+++ b/library/cpp/containers/flat_hash/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/flat_hash/CMakeLists.txt b/library/cpp/containers/flat_hash/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/flat_hash/CMakeLists.txt
+++ b/library/cpp/containers/flat_hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/intrusive_avl_tree/CMakeLists.darwin.txt b/library/cpp/containers/intrusive_avl_tree/CMakeLists.darwin-x86_64.txt
index 651df561c1d..651df561c1d 100644
--- a/library/cpp/containers/intrusive_avl_tree/CMakeLists.darwin.txt
+++ b/library/cpp/containers/intrusive_avl_tree/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/intrusive_avl_tree/CMakeLists.linux.txt b/library/cpp/containers/intrusive_avl_tree/CMakeLists.linux-x86_64.txt
index b558f155bc7..b558f155bc7 100644
--- a/library/cpp/containers/intrusive_avl_tree/CMakeLists.linux.txt
+++ b/library/cpp/containers/intrusive_avl_tree/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/intrusive_avl_tree/CMakeLists.txt b/library/cpp/containers/intrusive_avl_tree/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/intrusive_avl_tree/CMakeLists.txt
+++ b/library/cpp/containers/intrusive_avl_tree/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/intrusive_rb_tree/CMakeLists.darwin.txt b/library/cpp/containers/intrusive_rb_tree/CMakeLists.darwin-x86_64.txt
index 45d7acb8388..45d7acb8388 100644
--- a/library/cpp/containers/intrusive_rb_tree/CMakeLists.darwin.txt
+++ b/library/cpp/containers/intrusive_rb_tree/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/intrusive_rb_tree/CMakeLists.linux.txt b/library/cpp/containers/intrusive_rb_tree/CMakeLists.linux-x86_64.txt
index 82927607d1c..82927607d1c 100644
--- a/library/cpp/containers/intrusive_rb_tree/CMakeLists.linux.txt
+++ b/library/cpp/containers/intrusive_rb_tree/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt b/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt
+++ b/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/paged_vector/CMakeLists.darwin.txt b/library/cpp/containers/paged_vector/CMakeLists.darwin-x86_64.txt
index c44af664bcc..c44af664bcc 100644
--- a/library/cpp/containers/paged_vector/CMakeLists.darwin.txt
+++ b/library/cpp/containers/paged_vector/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/paged_vector/CMakeLists.linux.txt b/library/cpp/containers/paged_vector/CMakeLists.linux-x86_64.txt
index b1f740cc454..b1f740cc454 100644
--- a/library/cpp/containers/paged_vector/CMakeLists.linux.txt
+++ b/library/cpp/containers/paged_vector/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/paged_vector/CMakeLists.txt b/library/cpp/containers/paged_vector/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/paged_vector/CMakeLists.txt
+++ b/library/cpp/containers/paged_vector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/ring_buffer/CMakeLists.darwin.txt b/library/cpp/containers/ring_buffer/CMakeLists.darwin-x86_64.txt
index 490e1427d4c..490e1427d4c 100644
--- a/library/cpp/containers/ring_buffer/CMakeLists.darwin.txt
+++ b/library/cpp/containers/ring_buffer/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/ring_buffer/CMakeLists.linux.txt b/library/cpp/containers/ring_buffer/CMakeLists.linux-x86_64.txt
index 59e7ab09286..59e7ab09286 100644
--- a/library/cpp/containers/ring_buffer/CMakeLists.linux.txt
+++ b/library/cpp/containers/ring_buffer/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/ring_buffer/CMakeLists.txt b/library/cpp/containers/ring_buffer/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/ring_buffer/CMakeLists.txt
+++ b/library/cpp/containers/ring_buffer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/sorted_vector/CMakeLists.darwin.txt b/library/cpp/containers/sorted_vector/CMakeLists.darwin-x86_64.txt
index e1438df9747..e1438df9747 100644
--- a/library/cpp/containers/sorted_vector/CMakeLists.darwin.txt
+++ b/library/cpp/containers/sorted_vector/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/sorted_vector/CMakeLists.linux.txt b/library/cpp/containers/sorted_vector/CMakeLists.linux-x86_64.txt
index 8af3de1300f..8af3de1300f 100644
--- a/library/cpp/containers/sorted_vector/CMakeLists.linux.txt
+++ b/library/cpp/containers/sorted_vector/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/sorted_vector/CMakeLists.txt b/library/cpp/containers/sorted_vector/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/sorted_vector/CMakeLists.txt
+++ b/library/cpp/containers/sorted_vector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/stack_array/CMakeLists.darwin.txt b/library/cpp/containers/stack_array/CMakeLists.darwin-x86_64.txt
index 83fde56a05a..83fde56a05a 100644
--- a/library/cpp/containers/stack_array/CMakeLists.darwin.txt
+++ b/library/cpp/containers/stack_array/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/stack_array/CMakeLists.linux.txt b/library/cpp/containers/stack_array/CMakeLists.linux-x86_64.txt
index 1d3d430a320..1d3d430a320 100644
--- a/library/cpp/containers/stack_array/CMakeLists.linux.txt
+++ b/library/cpp/containers/stack_array/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/stack_array/CMakeLists.txt b/library/cpp/containers/stack_array/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/stack_array/CMakeLists.txt
+++ b/library/cpp/containers/stack_array/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/stack_vector/CMakeLists.darwin.txt b/library/cpp/containers/stack_vector/CMakeLists.darwin-x86_64.txt
index 2950b6b535c..2950b6b535c 100644
--- a/library/cpp/containers/stack_vector/CMakeLists.darwin.txt
+++ b/library/cpp/containers/stack_vector/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/stack_vector/CMakeLists.linux.txt b/library/cpp/containers/stack_vector/CMakeLists.linux-x86_64.txt
index c4bb46961ff..c4bb46961ff 100644
--- a/library/cpp/containers/stack_vector/CMakeLists.linux.txt
+++ b/library/cpp/containers/stack_vector/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/stack_vector/CMakeLists.txt b/library/cpp/containers/stack_vector/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/stack_vector/CMakeLists.txt
+++ b/library/cpp/containers/stack_vector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/str_map/CMakeLists.darwin.txt b/library/cpp/containers/str_map/CMakeLists.darwin-x86_64.txt
index ee42c250c61..ee42c250c61 100644
--- a/library/cpp/containers/str_map/CMakeLists.darwin.txt
+++ b/library/cpp/containers/str_map/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/str_map/CMakeLists.linux.txt b/library/cpp/containers/str_map/CMakeLists.linux-x86_64.txt
index e78f115ba1c..e78f115ba1c 100644
--- a/library/cpp/containers/str_map/CMakeLists.linux.txt
+++ b/library/cpp/containers/str_map/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/str_map/CMakeLists.txt b/library/cpp/containers/str_map/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/str_map/CMakeLists.txt
+++ b/library/cpp/containers/str_map/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/top_keeper/CMakeLists.darwin.txt b/library/cpp/containers/top_keeper/CMakeLists.darwin-x86_64.txt
index cc2996b5112..cc2996b5112 100644
--- a/library/cpp/containers/top_keeper/CMakeLists.darwin.txt
+++ b/library/cpp/containers/top_keeper/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/top_keeper/CMakeLists.linux.txt b/library/cpp/containers/top_keeper/CMakeLists.linux-x86_64.txt
index 0549b8da46d..0549b8da46d 100644
--- a/library/cpp/containers/top_keeper/CMakeLists.linux.txt
+++ b/library/cpp/containers/top_keeper/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/top_keeper/CMakeLists.txt b/library/cpp/containers/top_keeper/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/containers/top_keeper/CMakeLists.txt
+++ b/library/cpp/containers/top_keeper/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/coroutine/engine/CMakeLists.darwin.txt b/library/cpp/coroutine/engine/CMakeLists.darwin-x86_64.txt
index d709a1e9433..d709a1e9433 100644
--- a/library/cpp/coroutine/engine/CMakeLists.darwin.txt
+++ b/library/cpp/coroutine/engine/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/coroutine/engine/CMakeLists.linux.txt b/library/cpp/coroutine/engine/CMakeLists.linux-x86_64.txt
index b2912afd4c8..b2912afd4c8 100644
--- a/library/cpp/coroutine/engine/CMakeLists.linux.txt
+++ b/library/cpp/coroutine/engine/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/coroutine/engine/CMakeLists.txt b/library/cpp/coroutine/engine/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/coroutine/engine/CMakeLists.txt
+++ b/library/cpp/coroutine/engine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/coroutine/listener/CMakeLists.darwin.txt b/library/cpp/coroutine/listener/CMakeLists.darwin-x86_64.txt
index 125cb4b2ed9..125cb4b2ed9 100644
--- a/library/cpp/coroutine/listener/CMakeLists.darwin.txt
+++ b/library/cpp/coroutine/listener/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/coroutine/listener/CMakeLists.linux.txt b/library/cpp/coroutine/listener/CMakeLists.linux-x86_64.txt
index 6e1b4b95d15..6e1b4b95d15 100644
--- a/library/cpp/coroutine/listener/CMakeLists.linux.txt
+++ b/library/cpp/coroutine/listener/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/coroutine/listener/CMakeLists.txt b/library/cpp/coroutine/listener/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/coroutine/listener/CMakeLists.txt
+++ b/library/cpp/coroutine/listener/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/cppparser/CMakeLists.darwin.txt b/library/cpp/cppparser/CMakeLists.darwin-x86_64.txt
index 73f1df8e6f7..73f1df8e6f7 100644
--- a/library/cpp/cppparser/CMakeLists.darwin.txt
+++ b/library/cpp/cppparser/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/cppparser/CMakeLists.linux.txt b/library/cpp/cppparser/CMakeLists.linux-x86_64.txt
index 1e9530b77d9..1e9530b77d9 100644
--- a/library/cpp/cppparser/CMakeLists.linux.txt
+++ b/library/cpp/cppparser/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/cppparser/CMakeLists.txt b/library/cpp/cppparser/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/cppparser/CMakeLists.txt
+++ b/library/cpp/cppparser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/cpuid_check/CMakeLists.darwin.txt b/library/cpp/cpuid_check/CMakeLists.darwin-x86_64.txt
index 78664f1ffe3..78664f1ffe3 100644
--- a/library/cpp/cpuid_check/CMakeLists.darwin.txt
+++ b/library/cpp/cpuid_check/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/cpuid_check/CMakeLists.linux.txt b/library/cpp/cpuid_check/CMakeLists.linux-x86_64.txt
index a45f22e5e32..a45f22e5e32 100644
--- a/library/cpp/cpuid_check/CMakeLists.linux.txt
+++ b/library/cpp/cpuid_check/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/cpuid_check/CMakeLists.txt b/library/cpp/cpuid_check/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/library/cpp/cpuid_check/CMakeLists.txt
+++ b/library/cpp/cpuid_check/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/dbg_output/CMakeLists.darwin.txt b/library/cpp/dbg_output/CMakeLists.darwin-x86_64.txt
index 6e29430ec2e..6e29430ec2e 100644
--- a/library/cpp/dbg_output/CMakeLists.darwin.txt
+++ b/library/cpp/dbg_output/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/dbg_output/CMakeLists.linux.txt b/library/cpp/dbg_output/CMakeLists.linux-x86_64.txt
index 1e819ca7239..1e819ca7239 100644
--- a/library/cpp/dbg_output/CMakeLists.linux.txt
+++ b/library/cpp/dbg_output/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/dbg_output/CMakeLists.txt b/library/cpp/dbg_output/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/dbg_output/CMakeLists.txt
+++ b/library/cpp/dbg_output/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/accessors/CMakeLists.darwin.txt b/library/cpp/deprecated/accessors/CMakeLists.darwin-x86_64.txt
index 62226eb5590..62226eb5590 100644
--- a/library/cpp/deprecated/accessors/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/accessors/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/accessors/CMakeLists.linux.txt b/library/cpp/deprecated/accessors/CMakeLists.linux-x86_64.txt
index 0d8a3a9ed2c..0d8a3a9ed2c 100644
--- a/library/cpp/deprecated/accessors/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/accessors/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/accessors/CMakeLists.txt b/library/cpp/deprecated/accessors/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/deprecated/accessors/CMakeLists.txt
+++ b/library/cpp/deprecated/accessors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/atomic/CMakeLists.darwin.txt b/library/cpp/deprecated/atomic/CMakeLists.darwin-x86_64.txt
index 411024be151..411024be151 100644
--- a/library/cpp/deprecated/atomic/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/atomic/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/atomic/CMakeLists.linux.txt b/library/cpp/deprecated/atomic/CMakeLists.linux-x86_64.txt
index 29db7b690f3..29db7b690f3 100644
--- a/library/cpp/deprecated/atomic/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/atomic/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/atomic/CMakeLists.txt b/library/cpp/deprecated/atomic/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/deprecated/atomic/CMakeLists.txt
+++ b/library/cpp/deprecated/atomic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/enum_codegen/CMakeLists.darwin.txt b/library/cpp/deprecated/enum_codegen/CMakeLists.darwin-x86_64.txt
index 3ec6a99b97c..3ec6a99b97c 100644
--- a/library/cpp/deprecated/enum_codegen/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/enum_codegen/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/enum_codegen/CMakeLists.linux.txt b/library/cpp/deprecated/enum_codegen/CMakeLists.linux-x86_64.txt
index 255bbbe4537..255bbbe4537 100644
--- a/library/cpp/deprecated/enum_codegen/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/enum_codegen/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/enum_codegen/CMakeLists.txt b/library/cpp/deprecated/enum_codegen/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/deprecated/enum_codegen/CMakeLists.txt
+++ b/library/cpp/deprecated/enum_codegen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/kmp/CMakeLists.darwin.txt b/library/cpp/deprecated/kmp/CMakeLists.darwin-x86_64.txt
index 1a8b825dad6..1a8b825dad6 100644
--- a/library/cpp/deprecated/kmp/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/kmp/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/kmp/CMakeLists.linux.txt b/library/cpp/deprecated/kmp/CMakeLists.linux-x86_64.txt
index ed7a436e3c9..ed7a436e3c9 100644
--- a/library/cpp/deprecated/kmp/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/kmp/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/kmp/CMakeLists.txt b/library/cpp/deprecated/kmp/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/deprecated/kmp/CMakeLists.txt
+++ b/library/cpp/deprecated/kmp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/split/CMakeLists.darwin.txt b/library/cpp/deprecated/split/CMakeLists.darwin-x86_64.txt
index d23b1620f78..d23b1620f78 100644
--- a/library/cpp/deprecated/split/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/split/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/split/CMakeLists.linux.txt b/library/cpp/deprecated/split/CMakeLists.linux-x86_64.txt
index 4851ba6aba6..4851ba6aba6 100644
--- a/library/cpp/deprecated/split/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/split/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/split/CMakeLists.txt b/library/cpp/deprecated/split/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/deprecated/split/CMakeLists.txt
+++ b/library/cpp/deprecated/split/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/diff/CMakeLists.darwin.txt b/library/cpp/diff/CMakeLists.darwin-x86_64.txt
index f6c4677907d..f6c4677907d 100644
--- a/library/cpp/diff/CMakeLists.darwin.txt
+++ b/library/cpp/diff/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/diff/CMakeLists.linux.txt b/library/cpp/diff/CMakeLists.linux-x86_64.txt
index 47ba972f0fb..47ba972f0fb 100644
--- a/library/cpp/diff/CMakeLists.linux.txt
+++ b/library/cpp/diff/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/diff/CMakeLists.txt b/library/cpp/diff/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/diff/CMakeLists.txt
+++ b/library/cpp/diff/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/CMakeLists.darwin.txt b/library/cpp/digest/argonish/CMakeLists.darwin-x86_64.txt
index 7b132051dad..7b132051dad 100644
--- a/library/cpp/digest/argonish/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/CMakeLists.linux.txt b/library/cpp/digest/argonish/CMakeLists.linux-x86_64.txt
index 2eafc5fe69d..2eafc5fe69d 100644
--- a/library/cpp/digest/argonish/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/CMakeLists.txt b/library/cpp/digest/argonish/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/argonish/CMakeLists.txt
+++ b/library/cpp/digest/argonish/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/argon2/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/argon2/CMakeLists.darwin-x86_64.txt
index e2dbc9ace90..e2dbc9ace90 100644
--- a/library/cpp/digest/argonish/internal/argon2/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/argon2/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/argon2/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/argon2/CMakeLists.linux-x86_64.txt
index b0bc4fd1cd8..b0bc4fd1cd8 100644
--- a/library/cpp/digest/argonish/internal/argon2/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/argon2/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/argon2/CMakeLists.txt b/library/cpp/digest/argonish/internal/argon2/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/argonish/internal/argon2/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/argon2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.darwin-x86_64.txt
index 63474af49f6..63474af49f6 100644
--- a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.linux-x86_64.txt
index 390ba105482..390ba105482 100644
--- a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/blamka/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/blamka/CMakeLists.darwin-x86_64.txt
index 7e8d1fcb36b..7e8d1fcb36b 100644
--- a/library/cpp/digest/argonish/internal/blamka/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/blamka/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/blamka/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/blamka/CMakeLists.linux-x86_64.txt
index f6df186ad25..f6df186ad25 100644
--- a/library/cpp/digest/argonish/internal/blamka/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/blamka/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/blamka/CMakeLists.txt b/library/cpp/digest/argonish/internal/blamka/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/argonish/internal/blamka/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/blamka/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/CMakeLists.darwin-x86_64.txt
index e34d1b90656..e34d1b90656 100644
--- a/library/cpp/digest/argonish/internal/proxies/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/CMakeLists.linux-x86_64.txt
index e34d1b90656..e34d1b90656 100644
--- a/library/cpp/digest/argonish/internal/proxies/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.darwin-x86_64.txt
index 6242e299b8f..6242e299b8f 100644
--- a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.linux-x86_64.txt
index 1f954bb636d..1f954bb636d 100644
--- a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.darwin-x86_64.txt
index bb153d887af..bb153d887af 100644
--- a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.linux-x86_64.txt
index a5caf518c96..a5caf518c96 100644
--- a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.darwin-x86_64.txt
index f4ed53513cc..f4ed53513cc 100644
--- a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.linux-x86_64.txt
index 0f6d317b77a..0f6d317b77a 100644
--- a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.darwin-x86_64.txt
index 7b57a5e09b2..7b57a5e09b2 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.linux-x86_64.txt
index 3c12d161173..3c12d161173 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.darwin-x86_64.txt
index 48f772826d3..48f772826d3 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.linux-x86_64.txt
index 602f000ee5a..602f000ee5a 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.darwin-x86_64.txt
index 8c1d2591ed7..8c1d2591ed7 100644
--- a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.linux-x86_64.txt
index b70cc4d942d..b70cc4d942d 100644
--- a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/rotations/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/rotations/CMakeLists.darwin-x86_64.txt
index b4468ed3514..b4468ed3514 100644
--- a/library/cpp/digest/argonish/internal/rotations/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/rotations/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/rotations/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/rotations/CMakeLists.linux-x86_64.txt
index 1ef3f3119d7..1ef3f3119d7 100644
--- a/library/cpp/digest/argonish/internal/rotations/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/rotations/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/rotations/CMakeLists.txt b/library/cpp/digest/argonish/internal/rotations/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/argonish/internal/rotations/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/rotations/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/crc32c/CMakeLists.darwin.txt b/library/cpp/digest/crc32c/CMakeLists.darwin-x86_64.txt
index 295652eae02..295652eae02 100644
--- a/library/cpp/digest/crc32c/CMakeLists.darwin.txt
+++ b/library/cpp/digest/crc32c/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/crc32c/CMakeLists.linux.txt b/library/cpp/digest/crc32c/CMakeLists.linux-x86_64.txt
index 8d93b2e2897..8d93b2e2897 100644
--- a/library/cpp/digest/crc32c/CMakeLists.linux.txt
+++ b/library/cpp/digest/crc32c/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/crc32c/CMakeLists.txt b/library/cpp/digest/crc32c/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/crc32c/CMakeLists.txt
+++ b/library/cpp/digest/crc32c/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/lower_case/CMakeLists.darwin.txt b/library/cpp/digest/lower_case/CMakeLists.darwin-x86_64.txt
index 5ab4c75fd03..5ab4c75fd03 100644
--- a/library/cpp/digest/lower_case/CMakeLists.darwin.txt
+++ b/library/cpp/digest/lower_case/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/lower_case/CMakeLists.linux.txt b/library/cpp/digest/lower_case/CMakeLists.linux-x86_64.txt
index f4bbc65bf69..f4bbc65bf69 100644
--- a/library/cpp/digest/lower_case/CMakeLists.linux.txt
+++ b/library/cpp/digest/lower_case/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/lower_case/CMakeLists.txt b/library/cpp/digest/lower_case/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/lower_case/CMakeLists.txt
+++ b/library/cpp/digest/lower_case/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/md5/CMakeLists.darwin.txt b/library/cpp/digest/md5/CMakeLists.darwin-x86_64.txt
index bbf3a1fc1e2..bbf3a1fc1e2 100644
--- a/library/cpp/digest/md5/CMakeLists.darwin.txt
+++ b/library/cpp/digest/md5/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/md5/CMakeLists.linux.txt b/library/cpp/digest/md5/CMakeLists.linux-x86_64.txt
index 86eead7bfa7..86eead7bfa7 100644
--- a/library/cpp/digest/md5/CMakeLists.linux.txt
+++ b/library/cpp/digest/md5/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/md5/CMakeLists.txt b/library/cpp/digest/md5/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/md5/CMakeLists.txt
+++ b/library/cpp/digest/md5/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/murmur/CMakeLists.darwin.txt b/library/cpp/digest/murmur/CMakeLists.darwin-x86_64.txt
index ac2e722ed81..ac2e722ed81 100644
--- a/library/cpp/digest/murmur/CMakeLists.darwin.txt
+++ b/library/cpp/digest/murmur/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/murmur/CMakeLists.linux.txt b/library/cpp/digest/murmur/CMakeLists.linux-x86_64.txt
index 71c5ec831d3..71c5ec831d3 100644
--- a/library/cpp/digest/murmur/CMakeLists.linux.txt
+++ b/library/cpp/digest/murmur/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/murmur/CMakeLists.txt b/library/cpp/digest/murmur/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/murmur/CMakeLists.txt
+++ b/library/cpp/digest/murmur/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/old_crc/CMakeLists.darwin.txt b/library/cpp/digest/old_crc/CMakeLists.darwin-x86_64.txt
index a4caa8c7569..a4caa8c7569 100644
--- a/library/cpp/digest/old_crc/CMakeLists.darwin.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/old_crc/CMakeLists.linux.txt b/library/cpp/digest/old_crc/CMakeLists.linux-x86_64.txt
index a0883b65f5e..a0883b65f5e 100644
--- a/library/cpp/digest/old_crc/CMakeLists.linux.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/old_crc/CMakeLists.txt b/library/cpp/digest/old_crc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/old_crc/CMakeLists.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin-x86_64.txt
index 84493649830..84493649830 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.linux.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-x86_64.txt
index ed861d121c8..ed861d121c8 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.linux.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/sfh/CMakeLists.darwin.txt b/library/cpp/digest/sfh/CMakeLists.darwin-x86_64.txt
index 53ca09e84ec..53ca09e84ec 100644
--- a/library/cpp/digest/sfh/CMakeLists.darwin.txt
+++ b/library/cpp/digest/sfh/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/sfh/CMakeLists.linux.txt b/library/cpp/digest/sfh/CMakeLists.linux-x86_64.txt
index 833aa8c0166..833aa8c0166 100644
--- a/library/cpp/digest/sfh/CMakeLists.linux.txt
+++ b/library/cpp/digest/sfh/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/sfh/CMakeLists.txt b/library/cpp/digest/sfh/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/digest/sfh/CMakeLists.txt
+++ b/library/cpp/digest/sfh/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/dns/CMakeLists.darwin.txt b/library/cpp/dns/CMakeLists.darwin-x86_64.txt
index c91919f0851..c91919f0851 100644
--- a/library/cpp/dns/CMakeLists.darwin.txt
+++ b/library/cpp/dns/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/dns/CMakeLists.linux.txt b/library/cpp/dns/CMakeLists.linux-x86_64.txt
index e2f9b3b08ab..e2f9b3b08ab 100644
--- a/library/cpp/dns/CMakeLists.linux.txt
+++ b/library/cpp/dns/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/dns/CMakeLists.txt b/library/cpp/dns/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/dns/CMakeLists.txt
+++ b/library/cpp/dns/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/enumbitset/CMakeLists.darwin.txt b/library/cpp/enumbitset/CMakeLists.darwin-x86_64.txt
index ff3bed8f5b4..ff3bed8f5b4 100644
--- a/library/cpp/enumbitset/CMakeLists.darwin.txt
+++ b/library/cpp/enumbitset/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/enumbitset/CMakeLists.linux.txt b/library/cpp/enumbitset/CMakeLists.linux-x86_64.txt
index 29fb5e0956b..29fb5e0956b 100644
--- a/library/cpp/enumbitset/CMakeLists.linux.txt
+++ b/library/cpp/enumbitset/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/enumbitset/CMakeLists.txt b/library/cpp/enumbitset/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/enumbitset/CMakeLists.txt
+++ b/library/cpp/enumbitset/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/execprofile/CMakeLists.darwin.txt b/library/cpp/execprofile/CMakeLists.darwin-x86_64.txt
index ec649dc8ada..ec649dc8ada 100644
--- a/library/cpp/execprofile/CMakeLists.darwin.txt
+++ b/library/cpp/execprofile/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/execprofile/CMakeLists.linux.txt b/library/cpp/execprofile/CMakeLists.linux-x86_64.txt
index 208b93382b4..208b93382b4 100644
--- a/library/cpp/execprofile/CMakeLists.linux.txt
+++ b/library/cpp/execprofile/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/execprofile/CMakeLists.txt b/library/cpp/execprofile/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/execprofile/CMakeLists.txt
+++ b/library/cpp/execprofile/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/getopt/CMakeLists.darwin.txt b/library/cpp/getopt/CMakeLists.darwin-x86_64.txt
index 96041aa7d2b..96041aa7d2b 100644
--- a/library/cpp/getopt/CMakeLists.darwin.txt
+++ b/library/cpp/getopt/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/getopt/CMakeLists.linux.txt b/library/cpp/getopt/CMakeLists.linux-x86_64.txt
index 7b7157919a0..7b7157919a0 100644
--- a/library/cpp/getopt/CMakeLists.linux.txt
+++ b/library/cpp/getopt/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/getopt/CMakeLists.txt b/library/cpp/getopt/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/getopt/CMakeLists.txt
+++ b/library/cpp/getopt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/getopt/small/CMakeLists.darwin.txt b/library/cpp/getopt/small/CMakeLists.darwin-x86_64.txt
index 04c5b67dda4..04c5b67dda4 100644
--- a/library/cpp/getopt/small/CMakeLists.darwin.txt
+++ b/library/cpp/getopt/small/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/getopt/small/CMakeLists.linux.txt b/library/cpp/getopt/small/CMakeLists.linux-x86_64.txt
index 5aabced8a31..5aabced8a31 100644
--- a/library/cpp/getopt/small/CMakeLists.linux.txt
+++ b/library/cpp/getopt/small/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/getopt/small/CMakeLists.txt b/library/cpp/getopt/small/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/getopt/small/CMakeLists.txt
+++ b/library/cpp/getopt/small/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/grpc/client/CMakeLists.darwin.txt b/library/cpp/grpc/client/CMakeLists.darwin-x86_64.txt
index db6f6bfdc1b..db6f6bfdc1b 100644
--- a/library/cpp/grpc/client/CMakeLists.darwin.txt
+++ b/library/cpp/grpc/client/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/grpc/client/CMakeLists.linux.txt b/library/cpp/grpc/client/CMakeLists.linux-x86_64.txt
index 80f660d62e3..80f660d62e3 100644
--- a/library/cpp/grpc/client/CMakeLists.linux.txt
+++ b/library/cpp/grpc/client/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/grpc/client/CMakeLists.txt b/library/cpp/grpc/client/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/grpc/client/CMakeLists.txt
+++ b/library/cpp/grpc/client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/grpc/server/CMakeLists.darwin.txt b/library/cpp/grpc/server/CMakeLists.darwin-x86_64.txt
index 1db66670688..1db66670688 100644
--- a/library/cpp/grpc/server/CMakeLists.darwin.txt
+++ b/library/cpp/grpc/server/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/grpc/server/CMakeLists.linux.txt b/library/cpp/grpc/server/CMakeLists.linux-x86_64.txt
index afeac13dc14..afeac13dc14 100644
--- a/library/cpp/grpc/server/CMakeLists.linux.txt
+++ b/library/cpp/grpc/server/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/grpc/server/CMakeLists.txt b/library/cpp/grpc/server/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/grpc/server/CMakeLists.txt
+++ b/library/cpp/grpc/server/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/grpc/server/actors/CMakeLists.darwin.txt b/library/cpp/grpc/server/actors/CMakeLists.darwin-x86_64.txt
index 1e710ad49aa..1e710ad49aa 100644
--- a/library/cpp/grpc/server/actors/CMakeLists.darwin.txt
+++ b/library/cpp/grpc/server/actors/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/grpc/server/actors/CMakeLists.linux.txt b/library/cpp/grpc/server/actors/CMakeLists.linux-x86_64.txt
index 0d8763b93d9..0d8763b93d9 100644
--- a/library/cpp/grpc/server/actors/CMakeLists.linux.txt
+++ b/library/cpp/grpc/server/actors/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/grpc/server/actors/CMakeLists.txt b/library/cpp/grpc/server/actors/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/grpc/server/actors/CMakeLists.txt
+++ b/library/cpp/grpc/server/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/histogram/adaptive/CMakeLists.darwin.txt b/library/cpp/histogram/adaptive/CMakeLists.darwin-x86_64.txt
index 82fb24cb786..82fb24cb786 100644
--- a/library/cpp/histogram/adaptive/CMakeLists.darwin.txt
+++ b/library/cpp/histogram/adaptive/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/histogram/adaptive/CMakeLists.linux.txt b/library/cpp/histogram/adaptive/CMakeLists.linux-x86_64.txt
index 089ec72973d..089ec72973d 100644
--- a/library/cpp/histogram/adaptive/CMakeLists.linux.txt
+++ b/library/cpp/histogram/adaptive/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/histogram/adaptive/CMakeLists.txt b/library/cpp/histogram/adaptive/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/histogram/adaptive/CMakeLists.txt
+++ b/library/cpp/histogram/adaptive/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/histogram/adaptive/protos/CMakeLists.darwin.txt b/library/cpp/histogram/adaptive/protos/CMakeLists.darwin-x86_64.txt
index ff0b6ce0f9b..ff0b6ce0f9b 100644
--- a/library/cpp/histogram/adaptive/protos/CMakeLists.darwin.txt
+++ b/library/cpp/histogram/adaptive/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/histogram/adaptive/protos/CMakeLists.linux.txt b/library/cpp/histogram/adaptive/protos/CMakeLists.linux-x86_64.txt
index c2746fae777..c2746fae777 100644
--- a/library/cpp/histogram/adaptive/protos/CMakeLists.linux.txt
+++ b/library/cpp/histogram/adaptive/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/histogram/adaptive/protos/CMakeLists.txt b/library/cpp/histogram/adaptive/protos/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/histogram/adaptive/protos/CMakeLists.txt
+++ b/library/cpp/histogram/adaptive/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/histogram/hdr/CMakeLists.darwin.txt b/library/cpp/histogram/hdr/CMakeLists.darwin-x86_64.txt
index cf961268fae..cf961268fae 100644
--- a/library/cpp/histogram/hdr/CMakeLists.darwin.txt
+++ b/library/cpp/histogram/hdr/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/histogram/hdr/CMakeLists.linux.txt b/library/cpp/histogram/hdr/CMakeLists.linux-x86_64.txt
index 66b62a62a9f..66b62a62a9f 100644
--- a/library/cpp/histogram/hdr/CMakeLists.linux.txt
+++ b/library/cpp/histogram/hdr/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/histogram/hdr/CMakeLists.txt b/library/cpp/histogram/hdr/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/histogram/hdr/CMakeLists.txt
+++ b/library/cpp/histogram/hdr/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/html/escape/CMakeLists.darwin.txt b/library/cpp/html/escape/CMakeLists.darwin-x86_64.txt
index 890dac15398..890dac15398 100644
--- a/library/cpp/html/escape/CMakeLists.darwin.txt
+++ b/library/cpp/html/escape/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/html/escape/CMakeLists.linux.txt b/library/cpp/html/escape/CMakeLists.linux-x86_64.txt
index 1a4747c4e3e..1a4747c4e3e 100644
--- a/library/cpp/html/escape/CMakeLists.linux.txt
+++ b/library/cpp/html/escape/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/html/escape/CMakeLists.txt b/library/cpp/html/escape/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/html/escape/CMakeLists.txt
+++ b/library/cpp/html/escape/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/html/pcdata/CMakeLists.darwin.txt b/library/cpp/html/pcdata/CMakeLists.darwin-x86_64.txt
index 0efffd69e04..0efffd69e04 100644
--- a/library/cpp/html/pcdata/CMakeLists.darwin.txt
+++ b/library/cpp/html/pcdata/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/html/pcdata/CMakeLists.linux.txt b/library/cpp/html/pcdata/CMakeLists.linux-x86_64.txt
index c6a073acafc..c6a073acafc 100644
--- a/library/cpp/html/pcdata/CMakeLists.linux.txt
+++ b/library/cpp/html/pcdata/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/html/pcdata/CMakeLists.txt b/library/cpp/html/pcdata/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/html/pcdata/CMakeLists.txt
+++ b/library/cpp/html/pcdata/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/fetch/CMakeLists.darwin.txt b/library/cpp/http/fetch/CMakeLists.darwin-x86_64.txt
index b507fb8c2ee..b507fb8c2ee 100644
--- a/library/cpp/http/fetch/CMakeLists.darwin.txt
+++ b/library/cpp/http/fetch/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/fetch/CMakeLists.linux.txt b/library/cpp/http/fetch/CMakeLists.linux-x86_64.txt
index 432831775a3..432831775a3 100644
--- a/library/cpp/http/fetch/CMakeLists.linux.txt
+++ b/library/cpp/http/fetch/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/fetch/CMakeLists.txt b/library/cpp/http/fetch/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/http/fetch/CMakeLists.txt
+++ b/library/cpp/http/fetch/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/io/CMakeLists.darwin.txt b/library/cpp/http/io/CMakeLists.darwin-x86_64.txt
index 1f1eab359c5..1f1eab359c5 100644
--- a/library/cpp/http/io/CMakeLists.darwin.txt
+++ b/library/cpp/http/io/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/io/CMakeLists.linux.txt b/library/cpp/http/io/CMakeLists.linux-x86_64.txt
index fb6cf45467e..fb6cf45467e 100644
--- a/library/cpp/http/io/CMakeLists.linux.txt
+++ b/library/cpp/http/io/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/io/CMakeLists.txt b/library/cpp/http/io/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/http/io/CMakeLists.txt
+++ b/library/cpp/http/io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/misc/CMakeLists.darwin.txt b/library/cpp/http/misc/CMakeLists.darwin-x86_64.txt
index c909854a9a7..c909854a9a7 100644
--- a/library/cpp/http/misc/CMakeLists.darwin.txt
+++ b/library/cpp/http/misc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/misc/CMakeLists.linux.txt b/library/cpp/http/misc/CMakeLists.linux-x86_64.txt
index 026af909922..026af909922 100644
--- a/library/cpp/http/misc/CMakeLists.linux.txt
+++ b/library/cpp/http/misc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/misc/CMakeLists.txt b/library/cpp/http/misc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/http/misc/CMakeLists.txt
+++ b/library/cpp/http/misc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/server/CMakeLists.darwin.txt b/library/cpp/http/server/CMakeLists.darwin-x86_64.txt
index 9d8b2182bab..9d8b2182bab 100644
--- a/library/cpp/http/server/CMakeLists.darwin.txt
+++ b/library/cpp/http/server/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/server/CMakeLists.linux.txt b/library/cpp/http/server/CMakeLists.linux-x86_64.txt
index be781cf25a9..be781cf25a9 100644
--- a/library/cpp/http/server/CMakeLists.linux.txt
+++ b/library/cpp/http/server/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/server/CMakeLists.txt b/library/cpp/http/server/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/http/server/CMakeLists.txt
+++ b/library/cpp/http/server/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/simple/CMakeLists.darwin.txt b/library/cpp/http/simple/CMakeLists.darwin-x86_64.txt
index 68c2fb64a3b..68c2fb64a3b 100644
--- a/library/cpp/http/simple/CMakeLists.darwin.txt
+++ b/library/cpp/http/simple/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/simple/CMakeLists.linux.txt b/library/cpp/http/simple/CMakeLists.linux-x86_64.txt
index 970d858e0e0..970d858e0e0 100644
--- a/library/cpp/http/simple/CMakeLists.linux.txt
+++ b/library/cpp/http/simple/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/simple/CMakeLists.txt b/library/cpp/http/simple/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/http/simple/CMakeLists.txt
+++ b/library/cpp/http/simple/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/hyperloglog/CMakeLists.darwin.txt b/library/cpp/hyperloglog/CMakeLists.darwin-x86_64.txt
index 5a180602bc5..5a180602bc5 100644
--- a/library/cpp/hyperloglog/CMakeLists.darwin.txt
+++ b/library/cpp/hyperloglog/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/hyperloglog/CMakeLists.linux.txt b/library/cpp/hyperloglog/CMakeLists.linux-x86_64.txt
index bbbb9103f6d..bbbb9103f6d 100644
--- a/library/cpp/hyperloglog/CMakeLists.linux.txt
+++ b/library/cpp/hyperloglog/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/hyperloglog/CMakeLists.txt b/library/cpp/hyperloglog/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/hyperloglog/CMakeLists.txt
+++ b/library/cpp/hyperloglog/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/int128/CMakeLists.darwin.txt b/library/cpp/int128/CMakeLists.darwin-x86_64.txt
index cdc5d289eec..cdc5d289eec 100644
--- a/library/cpp/int128/CMakeLists.darwin.txt
+++ b/library/cpp/int128/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/int128/CMakeLists.linux.txt b/library/cpp/int128/CMakeLists.linux-x86_64.txt
index 504a4558f75..504a4558f75 100644
--- a/library/cpp/int128/CMakeLists.linux.txt
+++ b/library/cpp/int128/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/int128/CMakeLists.txt b/library/cpp/int128/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/int128/CMakeLists.txt
+++ b/library/cpp/int128/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/ipmath/CMakeLists.darwin.txt b/library/cpp/ipmath/CMakeLists.darwin-x86_64.txt
index 78a4d06b4b9..78a4d06b4b9 100644
--- a/library/cpp/ipmath/CMakeLists.darwin.txt
+++ b/library/cpp/ipmath/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/ipmath/CMakeLists.linux.txt b/library/cpp/ipmath/CMakeLists.linux-x86_64.txt
index 65648f12ee0..65648f12ee0 100644
--- a/library/cpp/ipmath/CMakeLists.linux.txt
+++ b/library/cpp/ipmath/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/ipmath/CMakeLists.txt b/library/cpp/ipmath/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/ipmath/CMakeLists.txt
+++ b/library/cpp/ipmath/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/ipv6_address/CMakeLists.darwin.txt b/library/cpp/ipv6_address/CMakeLists.darwin-x86_64.txt
index 6156f5cbe2b..6156f5cbe2b 100644
--- a/library/cpp/ipv6_address/CMakeLists.darwin.txt
+++ b/library/cpp/ipv6_address/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/ipv6_address/CMakeLists.linux.txt b/library/cpp/ipv6_address/CMakeLists.linux-x86_64.txt
index 478d0655cf0..478d0655cf0 100644
--- a/library/cpp/ipv6_address/CMakeLists.linux.txt
+++ b/library/cpp/ipv6_address/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/ipv6_address/CMakeLists.txt b/library/cpp/ipv6_address/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/ipv6_address/CMakeLists.txt
+++ b/library/cpp/ipv6_address/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/iterator/CMakeLists.darwin.txt b/library/cpp/iterator/CMakeLists.darwin-x86_64.txt
index ee33c74ceac..ee33c74ceac 100644
--- a/library/cpp/iterator/CMakeLists.darwin.txt
+++ b/library/cpp/iterator/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/iterator/CMakeLists.linux.txt b/library/cpp/iterator/CMakeLists.linux-x86_64.txt
index 5fb04be0665..5fb04be0665 100644
--- a/library/cpp/iterator/CMakeLists.linux.txt
+++ b/library/cpp/iterator/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/iterator/CMakeLists.txt b/library/cpp/iterator/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/iterator/CMakeLists.txt
+++ b/library/cpp/iterator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/CMakeLists.darwin.txt b/library/cpp/json/CMakeLists.darwin-x86_64.txt
index bbf8222242f..bbf8222242f 100644
--- a/library/cpp/json/CMakeLists.darwin.txt
+++ b/library/cpp/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/CMakeLists.linux.txt b/library/cpp/json/CMakeLists.linux-x86_64.txt
index d55c7d2c3b2..d55c7d2c3b2 100644
--- a/library/cpp/json/CMakeLists.linux.txt
+++ b/library/cpp/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/CMakeLists.txt b/library/cpp/json/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/json/CMakeLists.txt
+++ b/library/cpp/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/common/CMakeLists.darwin.txt b/library/cpp/json/common/CMakeLists.darwin-x86_64.txt
index 3fc903e74d3..3fc903e74d3 100644
--- a/library/cpp/json/common/CMakeLists.darwin.txt
+++ b/library/cpp/json/common/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/common/CMakeLists.linux.txt b/library/cpp/json/common/CMakeLists.linux-x86_64.txt
index e957a689176..e957a689176 100644
--- a/library/cpp/json/common/CMakeLists.linux.txt
+++ b/library/cpp/json/common/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/common/CMakeLists.txt b/library/cpp/json/common/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/json/common/CMakeLists.txt
+++ b/library/cpp/json/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/easy_parse/CMakeLists.darwin.txt b/library/cpp/json/easy_parse/CMakeLists.darwin-x86_64.txt
index 18daf199138..18daf199138 100644
--- a/library/cpp/json/easy_parse/CMakeLists.darwin.txt
+++ b/library/cpp/json/easy_parse/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/easy_parse/CMakeLists.linux.txt b/library/cpp/json/easy_parse/CMakeLists.linux-x86_64.txt
index 604119958d7..604119958d7 100644
--- a/library/cpp/json/easy_parse/CMakeLists.linux.txt
+++ b/library/cpp/json/easy_parse/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/easy_parse/CMakeLists.txt b/library/cpp/json/easy_parse/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/json/easy_parse/CMakeLists.txt
+++ b/library/cpp/json/easy_parse/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/fast_sax/CMakeLists.darwin.txt b/library/cpp/json/fast_sax/CMakeLists.darwin-x86_64.txt
index 441d602ca7a..441d602ca7a 100644
--- a/library/cpp/json/fast_sax/CMakeLists.darwin.txt
+++ b/library/cpp/json/fast_sax/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/fast_sax/CMakeLists.linux.txt b/library/cpp/json/fast_sax/CMakeLists.linux-x86_64.txt
index 5a75c7a88f3..5a75c7a88f3 100644
--- a/library/cpp/json/fast_sax/CMakeLists.linux.txt
+++ b/library/cpp/json/fast_sax/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/fast_sax/CMakeLists.txt b/library/cpp/json/fast_sax/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/json/fast_sax/CMakeLists.txt
+++ b/library/cpp/json/fast_sax/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/writer/CMakeLists.darwin.txt b/library/cpp/json/writer/CMakeLists.darwin-x86_64.txt
index e164da14c0f..e164da14c0f 100644
--- a/library/cpp/json/writer/CMakeLists.darwin.txt
+++ b/library/cpp/json/writer/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/writer/CMakeLists.linux.txt b/library/cpp/json/writer/CMakeLists.linux-x86_64.txt
index 7793777f860..7793777f860 100644
--- a/library/cpp/json/writer/CMakeLists.linux.txt
+++ b/library/cpp/json/writer/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/writer/CMakeLists.txt b/library/cpp/json/writer/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/json/writer/CMakeLists.txt
+++ b/library/cpp/json/writer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/yson/CMakeLists.darwin.txt b/library/cpp/json/yson/CMakeLists.darwin-x86_64.txt
index 9f16a5a41e7..9f16a5a41e7 100644
--- a/library/cpp/json/yson/CMakeLists.darwin.txt
+++ b/library/cpp/json/yson/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/yson/CMakeLists.linux.txt b/library/cpp/json/yson/CMakeLists.linux-x86_64.txt
index b34d62f0e96..b34d62f0e96 100644
--- a/library/cpp/json/yson/CMakeLists.linux.txt
+++ b/library/cpp/json/yson/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/yson/CMakeLists.txt b/library/cpp/json/yson/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/json/yson/CMakeLists.txt
+++ b/library/cpp/json/yson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lcs/CMakeLists.darwin.txt b/library/cpp/lcs/CMakeLists.darwin-x86_64.txt
index 52cb38d6742..52cb38d6742 100644
--- a/library/cpp/lcs/CMakeLists.darwin.txt
+++ b/library/cpp/lcs/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lcs/CMakeLists.linux.txt b/library/cpp/lcs/CMakeLists.linux-x86_64.txt
index 6c570438f21..6c570438f21 100644
--- a/library/cpp/lcs/CMakeLists.linux.txt
+++ b/library/cpp/lcs/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lcs/CMakeLists.txt b/library/cpp/lcs/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/lcs/CMakeLists.txt
+++ b/library/cpp/lcs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lfalloc/CMakeLists.darwin.txt b/library/cpp/lfalloc/CMakeLists.darwin-x86_64.txt
index c5ee6488443..c5ee6488443 100644
--- a/library/cpp/lfalloc/CMakeLists.darwin.txt
+++ b/library/cpp/lfalloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lfalloc/CMakeLists.linux.txt b/library/cpp/lfalloc/CMakeLists.linux-x86_64.txt
index de6f97ec6aa..de6f97ec6aa 100644
--- a/library/cpp/lfalloc/CMakeLists.linux.txt
+++ b/library/cpp/lfalloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lfalloc/CMakeLists.txt b/library/cpp/lfalloc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/lfalloc/CMakeLists.txt
+++ b/library/cpp/lfalloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lfalloc/alloc_profiler/CMakeLists.darwin.txt b/library/cpp/lfalloc/alloc_profiler/CMakeLists.darwin-x86_64.txt
index b94d19ad32d..b94d19ad32d 100644
--- a/library/cpp/lfalloc/alloc_profiler/CMakeLists.darwin.txt
+++ b/library/cpp/lfalloc/alloc_profiler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lfalloc/alloc_profiler/CMakeLists.linux.txt b/library/cpp/lfalloc/alloc_profiler/CMakeLists.linux-x86_64.txt
index d215bfaccc0..d215bfaccc0 100644
--- a/library/cpp/lfalloc/alloc_profiler/CMakeLists.linux.txt
+++ b/library/cpp/lfalloc/alloc_profiler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lfalloc/alloc_profiler/CMakeLists.txt b/library/cpp/lfalloc/alloc_profiler/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/lfalloc/alloc_profiler/CMakeLists.txt
+++ b/library/cpp/lfalloc/alloc_profiler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lfalloc/dbg_info/CMakeLists.darwin.txt b/library/cpp/lfalloc/dbg_info/CMakeLists.darwin-x86_64.txt
index ec8b8ba23b9..ec8b8ba23b9 100644
--- a/library/cpp/lfalloc/dbg_info/CMakeLists.darwin.txt
+++ b/library/cpp/lfalloc/dbg_info/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lfalloc/dbg_info/CMakeLists.linux.txt b/library/cpp/lfalloc/dbg_info/CMakeLists.linux-x86_64.txt
index 05ee5297ba0..05ee5297ba0 100644
--- a/library/cpp/lfalloc/dbg_info/CMakeLists.linux.txt
+++ b/library/cpp/lfalloc/dbg_info/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lfalloc/dbg_info/CMakeLists.txt b/library/cpp/lfalloc/dbg_info/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/lfalloc/dbg_info/CMakeLists.txt
+++ b/library/cpp/lfalloc/dbg_info/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lfalloc/yt/CMakeLists.darwin.txt b/library/cpp/lfalloc/yt/CMakeLists.darwin-x86_64.txt
index ab5c2e2e91f..ab5c2e2e91f 100644
--- a/library/cpp/lfalloc/yt/CMakeLists.darwin.txt
+++ b/library/cpp/lfalloc/yt/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lfalloc/yt/CMakeLists.txt b/library/cpp/lfalloc/yt/CMakeLists.txt
index 270d5d94da9..5bedd04e092 100644
--- a/library/cpp/lfalloc/yt/CMakeLists.txt
+++ b/library/cpp/lfalloc/yt/CMakeLists.txt
@@ -7,5 +7,5 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 endif()
diff --git a/library/cpp/linear_regression/CMakeLists.darwin.txt b/library/cpp/linear_regression/CMakeLists.darwin-x86_64.txt
index db574777d63..db574777d63 100644
--- a/library/cpp/linear_regression/CMakeLists.darwin.txt
+++ b/library/cpp/linear_regression/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/linear_regression/CMakeLists.linux.txt b/library/cpp/linear_regression/CMakeLists.linux-x86_64.txt
index 154199c9526..154199c9526 100644
--- a/library/cpp/linear_regression/CMakeLists.linux.txt
+++ b/library/cpp/linear_regression/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/linear_regression/CMakeLists.txt b/library/cpp/linear_regression/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/linear_regression/CMakeLists.txt
+++ b/library/cpp/linear_regression/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/logger/CMakeLists.darwin.txt b/library/cpp/logger/CMakeLists.darwin-x86_64.txt
index 92cf5b5d93a..92cf5b5d93a 100644
--- a/library/cpp/logger/CMakeLists.darwin.txt
+++ b/library/cpp/logger/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/logger/CMakeLists.linux.txt b/library/cpp/logger/CMakeLists.linux-x86_64.txt
index 7656dd68618..7656dd68618 100644
--- a/library/cpp/logger/CMakeLists.linux.txt
+++ b/library/cpp/logger/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/logger/CMakeLists.txt b/library/cpp/logger/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/logger/CMakeLists.txt
+++ b/library/cpp/logger/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/logger/global/CMakeLists.darwin.txt b/library/cpp/logger/global/CMakeLists.darwin-x86_64.txt
index 4056287548b..4056287548b 100644
--- a/library/cpp/logger/global/CMakeLists.darwin.txt
+++ b/library/cpp/logger/global/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/logger/global/CMakeLists.linux.txt b/library/cpp/logger/global/CMakeLists.linux-x86_64.txt
index 708e01ed3a9..708e01ed3a9 100644
--- a/library/cpp/logger/global/CMakeLists.linux.txt
+++ b/library/cpp/logger/global/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/logger/global/CMakeLists.txt b/library/cpp/logger/global/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/logger/global/CMakeLists.txt
+++ b/library/cpp/logger/global/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lua/CMakeLists.darwin.txt b/library/cpp/lua/CMakeLists.darwin-x86_64.txt
index 7dc3bec75b7..7dc3bec75b7 100644
--- a/library/cpp/lua/CMakeLists.darwin.txt
+++ b/library/cpp/lua/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lua/CMakeLists.linux.txt b/library/cpp/lua/CMakeLists.linux-x86_64.txt
index e32791dfac8..e32791dfac8 100644
--- a/library/cpp/lua/CMakeLists.linux.txt
+++ b/library/cpp/lua/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lua/CMakeLists.txt b/library/cpp/lua/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/lua/CMakeLists.txt
+++ b/library/cpp/lua/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lwtrace/CMakeLists.darwin.txt b/library/cpp/lwtrace/CMakeLists.darwin-x86_64.txt
index 370dbb17fdf..370dbb17fdf 100644
--- a/library/cpp/lwtrace/CMakeLists.darwin.txt
+++ b/library/cpp/lwtrace/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lwtrace/CMakeLists.linux.txt b/library/cpp/lwtrace/CMakeLists.linux-x86_64.txt
index c16204ed5a7..c16204ed5a7 100644
--- a/library/cpp/lwtrace/CMakeLists.linux.txt
+++ b/library/cpp/lwtrace/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lwtrace/CMakeLists.txt b/library/cpp/lwtrace/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/lwtrace/CMakeLists.txt
+++ b/library/cpp/lwtrace/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lwtrace/mon/CMakeLists.darwin.txt b/library/cpp/lwtrace/mon/CMakeLists.darwin-x86_64.txt
index 84ce12f2084..84ce12f2084 100644
--- a/library/cpp/lwtrace/mon/CMakeLists.darwin.txt
+++ b/library/cpp/lwtrace/mon/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lwtrace/mon/CMakeLists.linux.txt b/library/cpp/lwtrace/mon/CMakeLists.linux-x86_64.txt
index 7f31cfc6fe7..7f31cfc6fe7 100644
--- a/library/cpp/lwtrace/mon/CMakeLists.linux.txt
+++ b/library/cpp/lwtrace/mon/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lwtrace/mon/CMakeLists.txt b/library/cpp/lwtrace/mon/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/lwtrace/mon/CMakeLists.txt
+++ b/library/cpp/lwtrace/mon/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lwtrace/mon/analytics/CMakeLists.darwin.txt b/library/cpp/lwtrace/mon/analytics/CMakeLists.darwin-x86_64.txt
index f1a03a5f4a5..f1a03a5f4a5 100644
--- a/library/cpp/lwtrace/mon/analytics/CMakeLists.darwin.txt
+++ b/library/cpp/lwtrace/mon/analytics/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lwtrace/mon/analytics/CMakeLists.linux.txt b/library/cpp/lwtrace/mon/analytics/CMakeLists.linux-x86_64.txt
index 21c332ae9ce..21c332ae9ce 100644
--- a/library/cpp/lwtrace/mon/analytics/CMakeLists.linux.txt
+++ b/library/cpp/lwtrace/mon/analytics/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lwtrace/mon/analytics/CMakeLists.txt b/library/cpp/lwtrace/mon/analytics/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/lwtrace/mon/analytics/CMakeLists.txt
+++ b/library/cpp/lwtrace/mon/analytics/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lwtrace/protos/CMakeLists.darwin.txt b/library/cpp/lwtrace/protos/CMakeLists.darwin-x86_64.txt
index 9caa6f58bf4..9caa6f58bf4 100644
--- a/library/cpp/lwtrace/protos/CMakeLists.darwin.txt
+++ b/library/cpp/lwtrace/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lwtrace/protos/CMakeLists.linux.txt b/library/cpp/lwtrace/protos/CMakeLists.linux-x86_64.txt
index f9321305c17..f9321305c17 100644
--- a/library/cpp/lwtrace/protos/CMakeLists.linux.txt
+++ b/library/cpp/lwtrace/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lwtrace/protos/CMakeLists.txt b/library/cpp/lwtrace/protos/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/lwtrace/protos/CMakeLists.txt
+++ b/library/cpp/lwtrace/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/CMakeLists.darwin.txt b/library/cpp/malloc/CMakeLists.darwin-x86_64.txt
index 5d8a4de4f74..5d8a4de4f74 100644
--- a/library/cpp/malloc/CMakeLists.darwin.txt
+++ b/library/cpp/malloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/malloc/CMakeLists.linux.txt b/library/cpp/malloc/CMakeLists.linux-x86_64.txt
index 974a53462bd..974a53462bd 100644
--- a/library/cpp/malloc/CMakeLists.linux.txt
+++ b/library/cpp/malloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/malloc/CMakeLists.txt b/library/cpp/malloc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/malloc/CMakeLists.txt
+++ b/library/cpp/malloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/api/CMakeLists.darwin.txt b/library/cpp/malloc/api/CMakeLists.darwin-x86_64.txt
index db837d83de0..db837d83de0 100644
--- a/library/cpp/malloc/api/CMakeLists.darwin.txt
+++ b/library/cpp/malloc/api/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/malloc/api/CMakeLists.linux.txt b/library/cpp/malloc/api/CMakeLists.linux-x86_64.txt
index 6b81b89d4c1..6b81b89d4c1 100644
--- a/library/cpp/malloc/api/CMakeLists.linux.txt
+++ b/library/cpp/malloc/api/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/malloc/api/CMakeLists.txt b/library/cpp/malloc/api/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/malloc/api/CMakeLists.txt
+++ b/library/cpp/malloc/api/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/jemalloc/CMakeLists.darwin.txt b/library/cpp/malloc/jemalloc/CMakeLists.darwin-x86_64.txt
index ea1e085b747..ea1e085b747 100644
--- a/library/cpp/malloc/jemalloc/CMakeLists.darwin.txt
+++ b/library/cpp/malloc/jemalloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/malloc/jemalloc/CMakeLists.linux.txt b/library/cpp/malloc/jemalloc/CMakeLists.linux-x86_64.txt
index f4c156bc0c1..f4c156bc0c1 100644
--- a/library/cpp/malloc/jemalloc/CMakeLists.linux.txt
+++ b/library/cpp/malloc/jemalloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/malloc/jemalloc/CMakeLists.txt b/library/cpp/malloc/jemalloc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/malloc/jemalloc/CMakeLists.txt
+++ b/library/cpp/malloc/jemalloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/system/CMakeLists.darwin.txt b/library/cpp/malloc/system/CMakeLists.darwin-x86_64.txt
index 72c039454cb..72c039454cb 100644
--- a/library/cpp/malloc/system/CMakeLists.darwin.txt
+++ b/library/cpp/malloc/system/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/malloc/system/CMakeLists.txt b/library/cpp/malloc/system/CMakeLists.txt
index 270d5d94da9..5bedd04e092 100644
--- a/library/cpp/malloc/system/CMakeLists.txt
+++ b/library/cpp/malloc/system/CMakeLists.txt
@@ -7,5 +7,5 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/tcmalloc/CMakeLists.linux.txt b/library/cpp/malloc/tcmalloc/CMakeLists.linux-x86_64.txt
index be15c6c3054..be15c6c3054 100644
--- a/library/cpp/malloc/tcmalloc/CMakeLists.linux.txt
+++ b/library/cpp/malloc/tcmalloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/malloc/tcmalloc/CMakeLists.txt b/library/cpp/malloc/tcmalloc/CMakeLists.txt
index ba630c0cc43..4349073206f 100644
--- a/library/cpp/malloc/tcmalloc/CMakeLists.txt
+++ b/library/cpp/malloc/tcmalloc/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/CMakeLists.darwin.txt b/library/cpp/messagebus/CMakeLists.darwin-x86_64.txt
index af2b7a20083..af2b7a20083 100644
--- a/library/cpp/messagebus/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/CMakeLists.linux.txt b/library/cpp/messagebus/CMakeLists.linux-x86_64.txt
index e27549d923a..e27549d923a 100644
--- a/library/cpp/messagebus/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/CMakeLists.txt b/library/cpp/messagebus/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/messagebus/CMakeLists.txt
+++ b/library/cpp/messagebus/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/actor/CMakeLists.darwin.txt b/library/cpp/messagebus/actor/CMakeLists.darwin-x86_64.txt
index da26bb12a8b..da26bb12a8b 100644
--- a/library/cpp/messagebus/actor/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/actor/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/actor/CMakeLists.linux.txt b/library/cpp/messagebus/actor/CMakeLists.linux-x86_64.txt
index c14195e9521..c14195e9521 100644
--- a/library/cpp/messagebus/actor/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/actor/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/actor/CMakeLists.txt b/library/cpp/messagebus/actor/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/messagebus/actor/CMakeLists.txt
+++ b/library/cpp/messagebus/actor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/config/CMakeLists.darwin.txt b/library/cpp/messagebus/config/CMakeLists.darwin-x86_64.txt
index 2ac52c60e8d..2ac52c60e8d 100644
--- a/library/cpp/messagebus/config/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/config/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/config/CMakeLists.linux.txt b/library/cpp/messagebus/config/CMakeLists.linux-x86_64.txt
index 0414cabc631..0414cabc631 100644
--- a/library/cpp/messagebus/config/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/config/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/config/CMakeLists.txt b/library/cpp/messagebus/config/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/messagebus/config/CMakeLists.txt
+++ b/library/cpp/messagebus/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.darwin.txt b/library/cpp/messagebus/monitoring/CMakeLists.darwin-x86_64.txt
index 0a5f1f85022..0a5f1f85022 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.linux.txt b/library/cpp/messagebus/monitoring/CMakeLists.linux-x86_64.txt
index d7ac9c9c03f..d7ac9c9c03f 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.txt b/library/cpp/messagebus/monitoring/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/oldmodule/CMakeLists.darwin.txt b/library/cpp/messagebus/oldmodule/CMakeLists.darwin-x86_64.txt
index 11b6ead04d4..11b6ead04d4 100644
--- a/library/cpp/messagebus/oldmodule/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/oldmodule/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/oldmodule/CMakeLists.linux.txt b/library/cpp/messagebus/oldmodule/CMakeLists.linux-x86_64.txt
index 8e3de5c67f8..8e3de5c67f8 100644
--- a/library/cpp/messagebus/oldmodule/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/oldmodule/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/oldmodule/CMakeLists.txt b/library/cpp/messagebus/oldmodule/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/messagebus/oldmodule/CMakeLists.txt
+++ b/library/cpp/messagebus/oldmodule/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/protobuf/CMakeLists.darwin.txt b/library/cpp/messagebus/protobuf/CMakeLists.darwin-x86_64.txt
index 8566a4b7efe..8566a4b7efe 100644
--- a/library/cpp/messagebus/protobuf/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/protobuf/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/protobuf/CMakeLists.linux.txt b/library/cpp/messagebus/protobuf/CMakeLists.linux-x86_64.txt
index e2350833929..e2350833929 100644
--- a/library/cpp/messagebus/protobuf/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/protobuf/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/protobuf/CMakeLists.txt b/library/cpp/messagebus/protobuf/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/messagebus/protobuf/CMakeLists.txt
+++ b/library/cpp/messagebus/protobuf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/scheduler/CMakeLists.darwin.txt b/library/cpp/messagebus/scheduler/CMakeLists.darwin-x86_64.txt
index 510bc01bd5a..510bc01bd5a 100644
--- a/library/cpp/messagebus/scheduler/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/scheduler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/scheduler/CMakeLists.linux.txt b/library/cpp/messagebus/scheduler/CMakeLists.linux-x86_64.txt
index 51187c45a47..51187c45a47 100644
--- a/library/cpp/messagebus/scheduler/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/scheduler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/scheduler/CMakeLists.txt b/library/cpp/messagebus/scheduler/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/messagebus/scheduler/CMakeLists.txt
+++ b/library/cpp/messagebus/scheduler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/www/CMakeLists.darwin.txt b/library/cpp/messagebus/www/CMakeLists.darwin-x86_64.txt
index 2d41aa33050..2d41aa33050 100644
--- a/library/cpp/messagebus/www/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/www/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/www/CMakeLists.linux.txt b/library/cpp/messagebus/www/CMakeLists.linux-x86_64.txt
index fdc6d5d131b..fdc6d5d131b 100644
--- a/library/cpp/messagebus/www/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/www/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/www/CMakeLists.txt b/library/cpp/messagebus/www/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/messagebus/www/CMakeLists.txt
+++ b/library/cpp/messagebus/www/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/mime/types/CMakeLists.darwin.txt b/library/cpp/mime/types/CMakeLists.darwin-x86_64.txt
index 8e4011a982a..8e4011a982a 100644
--- a/library/cpp/mime/types/CMakeLists.darwin.txt
+++ b/library/cpp/mime/types/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/mime/types/CMakeLists.linux.txt b/library/cpp/mime/types/CMakeLists.linux-x86_64.txt
index 85364f75957..85364f75957 100644
--- a/library/cpp/mime/types/CMakeLists.linux.txt
+++ b/library/cpp/mime/types/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/mime/types/CMakeLists.txt b/library/cpp/mime/types/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/mime/types/CMakeLists.txt
+++ b/library/cpp/mime/types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/deprecated/json/CMakeLists.darwin.txt b/library/cpp/monlib/deprecated/json/CMakeLists.darwin-x86_64.txt
index 6bcb22f8ccb..6bcb22f8ccb 100644
--- a/library/cpp/monlib/deprecated/json/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/deprecated/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/deprecated/json/CMakeLists.linux.txt b/library/cpp/monlib/deprecated/json/CMakeLists.linux-x86_64.txt
index c7cb3720d3e..c7cb3720d3e 100644
--- a/library/cpp/monlib/deprecated/json/CMakeLists.linux.txt
+++ b/library/cpp/monlib/deprecated/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/deprecated/json/CMakeLists.txt b/library/cpp/monlib/deprecated/json/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/deprecated/json/CMakeLists.txt
+++ b/library/cpp/monlib/deprecated/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/dynamic_counters/CMakeLists.darwin.txt b/library/cpp/monlib/dynamic_counters/CMakeLists.darwin-x86_64.txt
index 35f39a552a8..35f39a552a8 100644
--- a/library/cpp/monlib/dynamic_counters/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/dynamic_counters/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/dynamic_counters/CMakeLists.linux.txt b/library/cpp/monlib/dynamic_counters/CMakeLists.linux-x86_64.txt
index 79ee1ffe0ba..79ee1ffe0ba 100644
--- a/library/cpp/monlib/dynamic_counters/CMakeLists.linux.txt
+++ b/library/cpp/monlib/dynamic_counters/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/dynamic_counters/CMakeLists.txt b/library/cpp/monlib/dynamic_counters/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/dynamic_counters/CMakeLists.txt
+++ b/library/cpp/monlib/dynamic_counters/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.darwin.txt b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.darwin-x86_64.txt
index fa99d9dc2f5..fa99d9dc2f5 100644
--- a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.linux.txt b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.linux-x86_64.txt
index b6a771543e5..b6a771543e5 100644
--- a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.linux.txt
+++ b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt
+++ b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/CMakeLists.darwin.txt b/library/cpp/monlib/encode/CMakeLists.darwin-x86_64.txt
index a74b6d023d0..a74b6d023d0 100644
--- a/library/cpp/monlib/encode/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/CMakeLists.linux.txt b/library/cpp/monlib/encode/CMakeLists.linux-x86_64.txt
index 6c319f9b687..6c319f9b687 100644
--- a/library/cpp/monlib/encode/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/CMakeLists.txt b/library/cpp/monlib/encode/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/encode/CMakeLists.txt
+++ b/library/cpp/monlib/encode/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/buffered/CMakeLists.darwin.txt b/library/cpp/monlib/encode/buffered/CMakeLists.darwin-x86_64.txt
index e867afbb8c2..e867afbb8c2 100644
--- a/library/cpp/monlib/encode/buffered/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/buffered/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/buffered/CMakeLists.linux.txt b/library/cpp/monlib/encode/buffered/CMakeLists.linux-x86_64.txt
index 211beb8b275..211beb8b275 100644
--- a/library/cpp/monlib/encode/buffered/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/buffered/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/buffered/CMakeLists.txt b/library/cpp/monlib/encode/buffered/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/encode/buffered/CMakeLists.txt
+++ b/library/cpp/monlib/encode/buffered/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/json/CMakeLists.darwin.txt b/library/cpp/monlib/encode/json/CMakeLists.darwin-x86_64.txt
index 55a0abe1c30..55a0abe1c30 100644
--- a/library/cpp/monlib/encode/json/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/json/CMakeLists.linux.txt b/library/cpp/monlib/encode/json/CMakeLists.linux-x86_64.txt
index 6086064a853..6086064a853 100644
--- a/library/cpp/monlib/encode/json/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/json/CMakeLists.txt b/library/cpp/monlib/encode/json/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/encode/json/CMakeLists.txt
+++ b/library/cpp/monlib/encode/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.darwin.txt b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.darwin-x86_64.txt
index bce491e67e5..bce491e67e5 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.linux.txt b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.linux-x86_64.txt
index a86da32e117..a86da32e117 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/prometheus/CMakeLists.darwin.txt b/library/cpp/monlib/encode/prometheus/CMakeLists.darwin-x86_64.txt
index 2db649e6936..2db649e6936 100644
--- a/library/cpp/monlib/encode/prometheus/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/prometheus/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/prometheus/CMakeLists.linux.txt b/library/cpp/monlib/encode/prometheus/CMakeLists.linux-x86_64.txt
index 7c76369bd97..7c76369bd97 100644
--- a/library/cpp/monlib/encode/prometheus/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/prometheus/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/prometheus/CMakeLists.txt b/library/cpp/monlib/encode/prometheus/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/encode/prometheus/CMakeLists.txt
+++ b/library/cpp/monlib/encode/prometheus/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.darwin.txt b/library/cpp/monlib/encode/spack/CMakeLists.darwin-x86_64.txt
index 9eccd0b6297..9eccd0b6297 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.linux.txt b/library/cpp/monlib/encode/spack/CMakeLists.linux-x86_64.txt
index 118b9266386..118b9266386 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.txt b/library/cpp/monlib/encode/spack/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/text/CMakeLists.darwin.txt b/library/cpp/monlib/encode/text/CMakeLists.darwin-x86_64.txt
index 58143a2371f..58143a2371f 100644
--- a/library/cpp/monlib/encode/text/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/text/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/text/CMakeLists.linux.txt b/library/cpp/monlib/encode/text/CMakeLists.linux-x86_64.txt
index 3089820d80e..3089820d80e 100644
--- a/library/cpp/monlib/encode/text/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/text/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/text/CMakeLists.txt b/library/cpp/monlib/encode/text/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/encode/text/CMakeLists.txt
+++ b/library/cpp/monlib/encode/text/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/exception/CMakeLists.darwin.txt b/library/cpp/monlib/exception/CMakeLists.darwin-x86_64.txt
index 94cb28420f4..94cb28420f4 100644
--- a/library/cpp/monlib/exception/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/exception/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/exception/CMakeLists.linux.txt b/library/cpp/monlib/exception/CMakeLists.linux-x86_64.txt
index f1bd66c0dab..f1bd66c0dab 100644
--- a/library/cpp/monlib/exception/CMakeLists.linux.txt
+++ b/library/cpp/monlib/exception/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/exception/CMakeLists.txt b/library/cpp/monlib/exception/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/exception/CMakeLists.txt
+++ b/library/cpp/monlib/exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/messagebus/CMakeLists.darwin.txt b/library/cpp/monlib/messagebus/CMakeLists.darwin-x86_64.txt
index cae48e0a839..cae48e0a839 100644
--- a/library/cpp/monlib/messagebus/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/messagebus/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/messagebus/CMakeLists.linux.txt b/library/cpp/monlib/messagebus/CMakeLists.linux-x86_64.txt
index 98f2b23c778..98f2b23c778 100644
--- a/library/cpp/monlib/messagebus/CMakeLists.linux.txt
+++ b/library/cpp/monlib/messagebus/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/messagebus/CMakeLists.txt b/library/cpp/monlib/messagebus/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/messagebus/CMakeLists.txt
+++ b/library/cpp/monlib/messagebus/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/metrics/CMakeLists.darwin.txt b/library/cpp/monlib/metrics/CMakeLists.darwin-x86_64.txt
index 052ed067e17..052ed067e17 100644
--- a/library/cpp/monlib/metrics/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/metrics/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/metrics/CMakeLists.linux.txt b/library/cpp/monlib/metrics/CMakeLists.linux-x86_64.txt
index eb18b40c189..eb18b40c189 100644
--- a/library/cpp/monlib/metrics/CMakeLists.linux.txt
+++ b/library/cpp/monlib/metrics/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/metrics/CMakeLists.txt b/library/cpp/monlib/metrics/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/metrics/CMakeLists.txt
+++ b/library/cpp/monlib/metrics/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/service/CMakeLists.darwin.txt b/library/cpp/monlib/service/CMakeLists.darwin-x86_64.txt
index 48ffa45b49b..48ffa45b49b 100644
--- a/library/cpp/monlib/service/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/service/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/service/CMakeLists.linux.txt b/library/cpp/monlib/service/CMakeLists.linux-x86_64.txt
index 22d00e4e17e..22d00e4e17e 100644
--- a/library/cpp/monlib/service/CMakeLists.linux.txt
+++ b/library/cpp/monlib/service/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/service/CMakeLists.txt b/library/cpp/monlib/service/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/service/CMakeLists.txt
+++ b/library/cpp/monlib/service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/service/pages/CMakeLists.darwin.txt b/library/cpp/monlib/service/pages/CMakeLists.darwin-x86_64.txt
index 062d269d308..062d269d308 100644
--- a/library/cpp/monlib/service/pages/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/service/pages/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/service/pages/CMakeLists.linux.txt b/library/cpp/monlib/service/pages/CMakeLists.linux-x86_64.txt
index 099a0191ef9..099a0191ef9 100644
--- a/library/cpp/monlib/service/pages/CMakeLists.linux.txt
+++ b/library/cpp/monlib/service/pages/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/service/pages/CMakeLists.txt b/library/cpp/monlib/service/pages/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/service/pages/CMakeLists.txt
+++ b/library/cpp/monlib/service/pages/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.darwin.txt b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.darwin-x86_64.txt
index 516c919f8a7..516c919f8a7 100644
--- a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.linux.txt b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.linux-x86_64.txt
index 7e88b02a4b5..7e88b02a4b5 100644
--- a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.linux.txt
+++ b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt
+++ b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/on_disk/chunks/CMakeLists.darwin.txt b/library/cpp/on_disk/chunks/CMakeLists.darwin-x86_64.txt
index ca761a26c8a..ca761a26c8a 100644
--- a/library/cpp/on_disk/chunks/CMakeLists.darwin.txt
+++ b/library/cpp/on_disk/chunks/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/on_disk/chunks/CMakeLists.linux.txt b/library/cpp/on_disk/chunks/CMakeLists.linux-x86_64.txt
index 7db2f54c162..7db2f54c162 100644
--- a/library/cpp/on_disk/chunks/CMakeLists.linux.txt
+++ b/library/cpp/on_disk/chunks/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/on_disk/chunks/CMakeLists.txt b/library/cpp/on_disk/chunks/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/on_disk/chunks/CMakeLists.txt
+++ b/library/cpp/on_disk/chunks/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/openssl/holders/CMakeLists.darwin.txt b/library/cpp/openssl/holders/CMakeLists.darwin-x86_64.txt
index f0e455f3aab..f0e455f3aab 100644
--- a/library/cpp/openssl/holders/CMakeLists.darwin.txt
+++ b/library/cpp/openssl/holders/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/openssl/holders/CMakeLists.linux.txt b/library/cpp/openssl/holders/CMakeLists.linux-x86_64.txt
index 59f7ba41c48..59f7ba41c48 100644
--- a/library/cpp/openssl/holders/CMakeLists.linux.txt
+++ b/library/cpp/openssl/holders/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/openssl/holders/CMakeLists.txt b/library/cpp/openssl/holders/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/openssl/holders/CMakeLists.txt
+++ b/library/cpp/openssl/holders/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/openssl/init/CMakeLists.darwin.txt b/library/cpp/openssl/init/CMakeLists.darwin-x86_64.txt
index 1ba4d2cebf5..1ba4d2cebf5 100644
--- a/library/cpp/openssl/init/CMakeLists.darwin.txt
+++ b/library/cpp/openssl/init/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/openssl/init/CMakeLists.linux.txt b/library/cpp/openssl/init/CMakeLists.linux-x86_64.txt
index cf53e732397..cf53e732397 100644
--- a/library/cpp/openssl/init/CMakeLists.linux.txt
+++ b/library/cpp/openssl/init/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/openssl/init/CMakeLists.txt b/library/cpp/openssl/init/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/openssl/init/CMakeLists.txt
+++ b/library/cpp/openssl/init/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/openssl/io/CMakeLists.darwin.txt b/library/cpp/openssl/io/CMakeLists.darwin-x86_64.txt
index 51c040ccd3f..51c040ccd3f 100644
--- a/library/cpp/openssl/io/CMakeLists.darwin.txt
+++ b/library/cpp/openssl/io/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/openssl/io/CMakeLists.linux.txt b/library/cpp/openssl/io/CMakeLists.linux-x86_64.txt
index e932afdd60c..e932afdd60c 100644
--- a/library/cpp/openssl/io/CMakeLists.linux.txt
+++ b/library/cpp/openssl/io/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/openssl/io/CMakeLists.txt b/library/cpp/openssl/io/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/openssl/io/CMakeLists.txt
+++ b/library/cpp/openssl/io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/openssl/method/CMakeLists.darwin.txt b/library/cpp/openssl/method/CMakeLists.darwin-x86_64.txt
index fcca44537ef..fcca44537ef 100644
--- a/library/cpp/openssl/method/CMakeLists.darwin.txt
+++ b/library/cpp/openssl/method/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/openssl/method/CMakeLists.linux.txt b/library/cpp/openssl/method/CMakeLists.linux-x86_64.txt
index fab526fe7ea..fab526fe7ea 100644
--- a/library/cpp/openssl/method/CMakeLists.linux.txt
+++ b/library/cpp/openssl/method/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/openssl/method/CMakeLists.txt b/library/cpp/openssl/method/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/openssl/method/CMakeLists.txt
+++ b/library/cpp/openssl/method/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/packedtypes/CMakeLists.darwin.txt b/library/cpp/packedtypes/CMakeLists.darwin-x86_64.txt
index 9e3e6c0b53e..9e3e6c0b53e 100644
--- a/library/cpp/packedtypes/CMakeLists.darwin.txt
+++ b/library/cpp/packedtypes/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/packedtypes/CMakeLists.linux.txt b/library/cpp/packedtypes/CMakeLists.linux-x86_64.txt
index d2705961bdf..d2705961bdf 100644
--- a/library/cpp/packedtypes/CMakeLists.linux.txt
+++ b/library/cpp/packedtypes/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/packedtypes/CMakeLists.txt b/library/cpp/packedtypes/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/packedtypes/CMakeLists.txt
+++ b/library/cpp/packedtypes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/packers/CMakeLists.darwin.txt b/library/cpp/packers/CMakeLists.darwin-x86_64.txt
index 59f8cfcaf5d..59f8cfcaf5d 100644
--- a/library/cpp/packers/CMakeLists.darwin.txt
+++ b/library/cpp/packers/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/packers/CMakeLists.linux.txt b/library/cpp/packers/CMakeLists.linux-x86_64.txt
index 6e4c5cd6b56..6e4c5cd6b56 100644
--- a/library/cpp/packers/CMakeLists.linux.txt
+++ b/library/cpp/packers/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/packers/CMakeLists.txt b/library/cpp/packers/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/packers/CMakeLists.txt
+++ b/library/cpp/packers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/pop_count/CMakeLists.darwin.txt b/library/cpp/pop_count/CMakeLists.darwin-x86_64.txt
index 30961489be5..30961489be5 100644
--- a/library/cpp/pop_count/CMakeLists.darwin.txt
+++ b/library/cpp/pop_count/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/pop_count/CMakeLists.linux.txt b/library/cpp/pop_count/CMakeLists.linux-x86_64.txt
index 5aac2bc61f7..5aac2bc61f7 100644
--- a/library/cpp/pop_count/CMakeLists.linux.txt
+++ b/library/cpp/pop_count/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/pop_count/CMakeLists.txt b/library/cpp/pop_count/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/pop_count/CMakeLists.txt
+++ b/library/cpp/pop_count/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/presort/CMakeLists.darwin.txt b/library/cpp/presort/CMakeLists.darwin-x86_64.txt
index 5f8c72b28c1..5f8c72b28c1 100644
--- a/library/cpp/presort/CMakeLists.darwin.txt
+++ b/library/cpp/presort/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/presort/CMakeLists.linux.txt b/library/cpp/presort/CMakeLists.linux-x86_64.txt
index da006d6682c..da006d6682c 100644
--- a/library/cpp/presort/CMakeLists.linux.txt
+++ b/library/cpp/presort/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/presort/CMakeLists.txt b/library/cpp/presort/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/presort/CMakeLists.txt
+++ b/library/cpp/presort/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/protobuf/interop/CMakeLists.darwin.txt b/library/cpp/protobuf/interop/CMakeLists.darwin-x86_64.txt
index 61799c97ffb..61799c97ffb 100644
--- a/library/cpp/protobuf/interop/CMakeLists.darwin.txt
+++ b/library/cpp/protobuf/interop/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/protobuf/interop/CMakeLists.linux.txt b/library/cpp/protobuf/interop/CMakeLists.linux-x86_64.txt
index 0c2bd62d47b..0c2bd62d47b 100644
--- a/library/cpp/protobuf/interop/CMakeLists.linux.txt
+++ b/library/cpp/protobuf/interop/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/protobuf/interop/CMakeLists.txt b/library/cpp/protobuf/interop/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/protobuf/interop/CMakeLists.txt
+++ b/library/cpp/protobuf/interop/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/protobuf/json/CMakeLists.darwin.txt b/library/cpp/protobuf/json/CMakeLists.darwin-x86_64.txt
index 5eb786fb5be..5eb786fb5be 100644
--- a/library/cpp/protobuf/json/CMakeLists.darwin.txt
+++ b/library/cpp/protobuf/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/protobuf/json/CMakeLists.linux.txt b/library/cpp/protobuf/json/CMakeLists.linux-x86_64.txt
index 6fce8bebb06..6fce8bebb06 100644
--- a/library/cpp/protobuf/json/CMakeLists.linux.txt
+++ b/library/cpp/protobuf/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/protobuf/json/CMakeLists.txt b/library/cpp/protobuf/json/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/protobuf/json/CMakeLists.txt
+++ b/library/cpp/protobuf/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/protobuf/util/CMakeLists.darwin.txt b/library/cpp/protobuf/util/CMakeLists.darwin-x86_64.txt
index 51b65cd5b9b..51b65cd5b9b 100644
--- a/library/cpp/protobuf/util/CMakeLists.darwin.txt
+++ b/library/cpp/protobuf/util/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/protobuf/util/CMakeLists.linux.txt b/library/cpp/protobuf/util/CMakeLists.linux-x86_64.txt
index 9ab7bb59e90..9ab7bb59e90 100644
--- a/library/cpp/protobuf/util/CMakeLists.linux.txt
+++ b/library/cpp/protobuf/util/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/protobuf/util/CMakeLists.txt b/library/cpp/protobuf/util/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/protobuf/util/CMakeLists.txt
+++ b/library/cpp/protobuf/util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/protobuf/util/proto/CMakeLists.darwin.txt b/library/cpp/protobuf/util/proto/CMakeLists.darwin-x86_64.txt
index 7a58b4bfebd..7a58b4bfebd 100644
--- a/library/cpp/protobuf/util/proto/CMakeLists.darwin.txt
+++ b/library/cpp/protobuf/util/proto/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/protobuf/util/proto/CMakeLists.linux.txt b/library/cpp/protobuf/util/proto/CMakeLists.linux-x86_64.txt
index 5f08e7a6913..5f08e7a6913 100644
--- a/library/cpp/protobuf/util/proto/CMakeLists.linux.txt
+++ b/library/cpp/protobuf/util/proto/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/protobuf/util/proto/CMakeLists.txt b/library/cpp/protobuf/util/proto/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/protobuf/util/proto/CMakeLists.txt
+++ b/library/cpp/protobuf/util/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/random_provider/CMakeLists.darwin.txt b/library/cpp/random_provider/CMakeLists.darwin-x86_64.txt
index ac70e71b915..ac70e71b915 100644
--- a/library/cpp/random_provider/CMakeLists.darwin.txt
+++ b/library/cpp/random_provider/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/random_provider/CMakeLists.linux.txt b/library/cpp/random_provider/CMakeLists.linux-x86_64.txt
index 797bda818a9..797bda818a9 100644
--- a/library/cpp/random_provider/CMakeLists.linux.txt
+++ b/library/cpp/random_provider/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/random_provider/CMakeLists.txt b/library/cpp/random_provider/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/random_provider/CMakeLists.txt
+++ b/library/cpp/random_provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/regex/CMakeLists.darwin.txt b/library/cpp/regex/CMakeLists.darwin-x86_64.txt
index 6e2a4fabcd2..6e2a4fabcd2 100644
--- a/library/cpp/regex/CMakeLists.darwin.txt
+++ b/library/cpp/regex/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/regex/CMakeLists.linux.txt b/library/cpp/regex/CMakeLists.linux-x86_64.txt
index 6e2a4fabcd2..6e2a4fabcd2 100644
--- a/library/cpp/regex/CMakeLists.linux.txt
+++ b/library/cpp/regex/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/regex/CMakeLists.txt b/library/cpp/regex/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/regex/CMakeLists.txt
+++ b/library/cpp/regex/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/regex/hyperscan/CMakeLists.darwin.txt b/library/cpp/regex/hyperscan/CMakeLists.darwin-x86_64.txt
index 47150388a7a..47150388a7a 100644
--- a/library/cpp/regex/hyperscan/CMakeLists.darwin.txt
+++ b/library/cpp/regex/hyperscan/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/regex/hyperscan/CMakeLists.linux.txt b/library/cpp/regex/hyperscan/CMakeLists.linux-x86_64.txt
index 8c71567f3a2..8c71567f3a2 100644
--- a/library/cpp/regex/hyperscan/CMakeLists.linux.txt
+++ b/library/cpp/regex/hyperscan/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/regex/hyperscan/CMakeLists.txt b/library/cpp/regex/hyperscan/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/library/cpp/regex/hyperscan/CMakeLists.txt
+++ b/library/cpp/regex/hyperscan/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/regex/pcre/CMakeLists.darwin.txt b/library/cpp/regex/pcre/CMakeLists.darwin-x86_64.txt
index 8e01e97c1d2..8e01e97c1d2 100644
--- a/library/cpp/regex/pcre/CMakeLists.darwin.txt
+++ b/library/cpp/regex/pcre/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/regex/pcre/CMakeLists.linux.txt b/library/cpp/regex/pcre/CMakeLists.linux-x86_64.txt
index f526317f26b..f526317f26b 100644
--- a/library/cpp/regex/pcre/CMakeLists.linux.txt
+++ b/library/cpp/regex/pcre/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/regex/pcre/CMakeLists.txt b/library/cpp/regex/pcre/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/regex/pcre/CMakeLists.txt
+++ b/library/cpp/regex/pcre/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/regex/pire/CMakeLists.darwin.txt b/library/cpp/regex/pire/CMakeLists.darwin-x86_64.txt
index f1fde4acf65..f1fde4acf65 100644
--- a/library/cpp/regex/pire/CMakeLists.darwin.txt
+++ b/library/cpp/regex/pire/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/regex/pire/CMakeLists.linux.txt b/library/cpp/regex/pire/CMakeLists.linux-x86_64.txt
index 9c4715c689c..9c4715c689c 100644
--- a/library/cpp/regex/pire/CMakeLists.linux.txt
+++ b/library/cpp/regex/pire/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/regex/pire/CMakeLists.txt b/library/cpp/regex/pire/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/regex/pire/CMakeLists.txt
+++ b/library/cpp/regex/pire/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/resource/CMakeLists.darwin.txt b/library/cpp/resource/CMakeLists.darwin-x86_64.txt
index a73bc8800f6..a73bc8800f6 100644
--- a/library/cpp/resource/CMakeLists.darwin.txt
+++ b/library/cpp/resource/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/resource/CMakeLists.linux.txt b/library/cpp/resource/CMakeLists.linux-x86_64.txt
index e569656a95f..e569656a95f 100644
--- a/library/cpp/resource/CMakeLists.linux.txt
+++ b/library/cpp/resource/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/resource/CMakeLists.txt b/library/cpp/resource/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/resource/CMakeLists.txt
+++ b/library/cpp/resource/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/retry/CMakeLists.darwin.txt b/library/cpp/retry/CMakeLists.darwin-x86_64.txt
index 5cfb972bb5f..5cfb972bb5f 100644
--- a/library/cpp/retry/CMakeLists.darwin.txt
+++ b/library/cpp/retry/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/retry/CMakeLists.linux.txt b/library/cpp/retry/CMakeLists.linux-x86_64.txt
index ca2003e3107..ca2003e3107 100644
--- a/library/cpp/retry/CMakeLists.linux.txt
+++ b/library/cpp/retry/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/retry/CMakeLists.txt b/library/cpp/retry/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/retry/CMakeLists.txt
+++ b/library/cpp/retry/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/retry/protos/CMakeLists.darwin.txt b/library/cpp/retry/protos/CMakeLists.darwin-x86_64.txt
index ba41965df26..ba41965df26 100644
--- a/library/cpp/retry/protos/CMakeLists.darwin.txt
+++ b/library/cpp/retry/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/retry/protos/CMakeLists.linux.txt b/library/cpp/retry/protos/CMakeLists.linux-x86_64.txt
index 3c4f9aed25c..3c4f9aed25c 100644
--- a/library/cpp/retry/protos/CMakeLists.linux.txt
+++ b/library/cpp/retry/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/retry/protos/CMakeLists.txt b/library/cpp/retry/protos/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/retry/protos/CMakeLists.txt
+++ b/library/cpp/retry/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/scheme/CMakeLists.darwin.txt b/library/cpp/scheme/CMakeLists.darwin-x86_64.txt
index 851add2e6cd..851add2e6cd 100644
--- a/library/cpp/scheme/CMakeLists.darwin.txt
+++ b/library/cpp/scheme/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/scheme/CMakeLists.linux.txt b/library/cpp/scheme/CMakeLists.linux-x86_64.txt
index 39139ce3c86..39139ce3c86 100644
--- a/library/cpp/scheme/CMakeLists.linux.txt
+++ b/library/cpp/scheme/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/scheme/CMakeLists.txt b/library/cpp/scheme/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/scheme/CMakeLists.txt
+++ b/library/cpp/scheme/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/sighandler/CMakeLists.darwin.txt b/library/cpp/sighandler/CMakeLists.darwin-x86_64.txt
index 3f330b9bb51..3f330b9bb51 100644
--- a/library/cpp/sighandler/CMakeLists.darwin.txt
+++ b/library/cpp/sighandler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/sighandler/CMakeLists.linux.txt b/library/cpp/sighandler/CMakeLists.linux-x86_64.txt
index 73b4b95275c..73b4b95275c 100644
--- a/library/cpp/sighandler/CMakeLists.linux.txt
+++ b/library/cpp/sighandler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/sighandler/CMakeLists.txt b/library/cpp/sighandler/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/sighandler/CMakeLists.txt
+++ b/library/cpp/sighandler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/sliding_window/CMakeLists.darwin.txt b/library/cpp/sliding_window/CMakeLists.darwin-x86_64.txt
index 15be6f0095d..15be6f0095d 100644
--- a/library/cpp/sliding_window/CMakeLists.darwin.txt
+++ b/library/cpp/sliding_window/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/sliding_window/CMakeLists.linux.txt b/library/cpp/sliding_window/CMakeLists.linux-x86_64.txt
index 110e2807e9b..110e2807e9b 100644
--- a/library/cpp/sliding_window/CMakeLists.linux.txt
+++ b/library/cpp/sliding_window/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/sliding_window/CMakeLists.txt b/library/cpp/sliding_window/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/sliding_window/CMakeLists.txt
+++ b/library/cpp/sliding_window/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/sse/CMakeLists.darwin.txt b/library/cpp/sse/CMakeLists.darwin-x86_64.txt
index dbd80b1e0cd..dbd80b1e0cd 100644
--- a/library/cpp/sse/CMakeLists.darwin.txt
+++ b/library/cpp/sse/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/sse/CMakeLists.linux.txt b/library/cpp/sse/CMakeLists.linux-x86_64.txt
index 9266eb99aec..9266eb99aec 100644
--- a/library/cpp/sse/CMakeLists.linux.txt
+++ b/library/cpp/sse/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/sse/CMakeLists.txt b/library/cpp/sse/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/sse/CMakeLists.txt
+++ b/library/cpp/sse/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/brotli/CMakeLists.darwin.txt b/library/cpp/streams/brotli/CMakeLists.darwin-x86_64.txt
index 71027159520..71027159520 100644
--- a/library/cpp/streams/brotli/CMakeLists.darwin.txt
+++ b/library/cpp/streams/brotli/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/brotli/CMakeLists.linux.txt b/library/cpp/streams/brotli/CMakeLists.linux-x86_64.txt
index 37e5df6e79e..37e5df6e79e 100644
--- a/library/cpp/streams/brotli/CMakeLists.linux.txt
+++ b/library/cpp/streams/brotli/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/brotli/CMakeLists.txt b/library/cpp/streams/brotli/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/streams/brotli/CMakeLists.txt
+++ b/library/cpp/streams/brotli/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/bzip2/CMakeLists.darwin.txt b/library/cpp/streams/bzip2/CMakeLists.darwin-x86_64.txt
index 5afa320647f..5afa320647f 100644
--- a/library/cpp/streams/bzip2/CMakeLists.darwin.txt
+++ b/library/cpp/streams/bzip2/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/bzip2/CMakeLists.linux.txt b/library/cpp/streams/bzip2/CMakeLists.linux-x86_64.txt
index d8cfeb870fe..d8cfeb870fe 100644
--- a/library/cpp/streams/bzip2/CMakeLists.linux.txt
+++ b/library/cpp/streams/bzip2/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/bzip2/CMakeLists.txt b/library/cpp/streams/bzip2/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/streams/bzip2/CMakeLists.txt
+++ b/library/cpp/streams/bzip2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/lzma/CMakeLists.darwin.txt b/library/cpp/streams/lzma/CMakeLists.darwin-x86_64.txt
index 3e5c652aeeb..3e5c652aeeb 100644
--- a/library/cpp/streams/lzma/CMakeLists.darwin.txt
+++ b/library/cpp/streams/lzma/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/lzma/CMakeLists.linux.txt b/library/cpp/streams/lzma/CMakeLists.linux-x86_64.txt
index 3893a3ea8b5..3893a3ea8b5 100644
--- a/library/cpp/streams/lzma/CMakeLists.linux.txt
+++ b/library/cpp/streams/lzma/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/lzma/CMakeLists.txt b/library/cpp/streams/lzma/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/streams/lzma/CMakeLists.txt
+++ b/library/cpp/streams/lzma/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/zc_memory_input/CMakeLists.darwin.txt b/library/cpp/streams/zc_memory_input/CMakeLists.darwin-x86_64.txt
index e0ddfec96c9..e0ddfec96c9 100644
--- a/library/cpp/streams/zc_memory_input/CMakeLists.darwin.txt
+++ b/library/cpp/streams/zc_memory_input/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/zc_memory_input/CMakeLists.linux.txt b/library/cpp/streams/zc_memory_input/CMakeLists.linux-x86_64.txt
index 557f29655be..557f29655be 100644
--- a/library/cpp/streams/zc_memory_input/CMakeLists.linux.txt
+++ b/library/cpp/streams/zc_memory_input/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/zc_memory_input/CMakeLists.txt b/library/cpp/streams/zc_memory_input/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/streams/zc_memory_input/CMakeLists.txt
+++ b/library/cpp/streams/zc_memory_input/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/zstd/CMakeLists.darwin.txt b/library/cpp/streams/zstd/CMakeLists.darwin-x86_64.txt
index 9a3521cd9b3..9a3521cd9b3 100644
--- a/library/cpp/streams/zstd/CMakeLists.darwin.txt
+++ b/library/cpp/streams/zstd/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/zstd/CMakeLists.linux.txt b/library/cpp/streams/zstd/CMakeLists.linux-x86_64.txt
index a48d43f3fdc..a48d43f3fdc 100644
--- a/library/cpp/streams/zstd/CMakeLists.linux.txt
+++ b/library/cpp/streams/zstd/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/zstd/CMakeLists.txt b/library/cpp/streams/zstd/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/streams/zstd/CMakeLists.txt
+++ b/library/cpp/streams/zstd/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/base64/CMakeLists.darwin.txt b/library/cpp/string_utils/base64/CMakeLists.darwin-x86_64.txt
index d4f74e8dc08..d4f74e8dc08 100644
--- a/library/cpp/string_utils/base64/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/base64/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/base64/CMakeLists.linux.txt b/library/cpp/string_utils/base64/CMakeLists.linux-x86_64.txt
index d5a19ed8ea1..d5a19ed8ea1 100644
--- a/library/cpp/string_utils/base64/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/base64/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/base64/CMakeLists.txt b/library/cpp/string_utils/base64/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/base64/CMakeLists.txt
+++ b/library/cpp/string_utils/base64/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/csv/CMakeLists.darwin.txt b/library/cpp/string_utils/csv/CMakeLists.darwin-x86_64.txt
index d50b571fdef..d50b571fdef 100644
--- a/library/cpp/string_utils/csv/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/csv/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/csv/CMakeLists.linux.txt b/library/cpp/string_utils/csv/CMakeLists.linux-x86_64.txt
index c5389658b16..c5389658b16 100644
--- a/library/cpp/string_utils/csv/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/csv/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/csv/CMakeLists.txt b/library/cpp/string_utils/csv/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/csv/CMakeLists.txt
+++ b/library/cpp/string_utils/csv/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/indent_text/CMakeLists.darwin.txt b/library/cpp/string_utils/indent_text/CMakeLists.darwin-x86_64.txt
index 6eca107f7fb..6eca107f7fb 100644
--- a/library/cpp/string_utils/indent_text/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/indent_text/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/indent_text/CMakeLists.linux.txt b/library/cpp/string_utils/indent_text/CMakeLists.linux-x86_64.txt
index afeec637dd8..afeec637dd8 100644
--- a/library/cpp/string_utils/indent_text/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/indent_text/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/indent_text/CMakeLists.txt b/library/cpp/string_utils/indent_text/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/indent_text/CMakeLists.txt
+++ b/library/cpp/string_utils/indent_text/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/levenshtein_diff/CMakeLists.darwin.txt b/library/cpp/string_utils/levenshtein_diff/CMakeLists.darwin-x86_64.txt
index 0d86ce0e677..0d86ce0e677 100644
--- a/library/cpp/string_utils/levenshtein_diff/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/levenshtein_diff/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/levenshtein_diff/CMakeLists.linux.txt b/library/cpp/string_utils/levenshtein_diff/CMakeLists.linux-x86_64.txt
index 18f5590ef98..18f5590ef98 100644
--- a/library/cpp/string_utils/levenshtein_diff/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/levenshtein_diff/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/levenshtein_diff/CMakeLists.txt b/library/cpp/string_utils/levenshtein_diff/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/levenshtein_diff/CMakeLists.txt
+++ b/library/cpp/string_utils/levenshtein_diff/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/parse_size/CMakeLists.darwin.txt b/library/cpp/string_utils/parse_size/CMakeLists.darwin-x86_64.txt
index 5cd758efec8..5cd758efec8 100644
--- a/library/cpp/string_utils/parse_size/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/parse_size/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/parse_size/CMakeLists.linux.txt b/library/cpp/string_utils/parse_size/CMakeLists.linux-x86_64.txt
index c50fd344c4e..c50fd344c4e 100644
--- a/library/cpp/string_utils/parse_size/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/parse_size/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/parse_size/CMakeLists.txt b/library/cpp/string_utils/parse_size/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/parse_size/CMakeLists.txt
+++ b/library/cpp/string_utils/parse_size/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/quote/CMakeLists.darwin.txt b/library/cpp/string_utils/quote/CMakeLists.darwin-x86_64.txt
index e2bedf1e187..e2bedf1e187 100644
--- a/library/cpp/string_utils/quote/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/quote/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/quote/CMakeLists.linux.txt b/library/cpp/string_utils/quote/CMakeLists.linux-x86_64.txt
index 28d1aabe8d2..28d1aabe8d2 100644
--- a/library/cpp/string_utils/quote/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/quote/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/quote/CMakeLists.txt b/library/cpp/string_utils/quote/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/quote/CMakeLists.txt
+++ b/library/cpp/string_utils/quote/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/relaxed_escaper/CMakeLists.darwin.txt b/library/cpp/string_utils/relaxed_escaper/CMakeLists.darwin-x86_64.txt
index 14901bec18c..14901bec18c 100644
--- a/library/cpp/string_utils/relaxed_escaper/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/relaxed_escaper/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/relaxed_escaper/CMakeLists.linux.txt b/library/cpp/string_utils/relaxed_escaper/CMakeLists.linux-x86_64.txt
index 6e952b89408..6e952b89408 100644
--- a/library/cpp/string_utils/relaxed_escaper/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/relaxed_escaper/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt b/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt
+++ b/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/scan/CMakeLists.darwin.txt b/library/cpp/string_utils/scan/CMakeLists.darwin-x86_64.txt
index 3d7752c1ff3..3d7752c1ff3 100644
--- a/library/cpp/string_utils/scan/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/scan/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/scan/CMakeLists.linux.txt b/library/cpp/string_utils/scan/CMakeLists.linux-x86_64.txt
index 4359ec58c08..4359ec58c08 100644
--- a/library/cpp/string_utils/scan/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/scan/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/scan/CMakeLists.txt b/library/cpp/string_utils/scan/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/scan/CMakeLists.txt
+++ b/library/cpp/string_utils/scan/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/url/CMakeLists.darwin.txt b/library/cpp/string_utils/url/CMakeLists.darwin-x86_64.txt
index 672139e643e..672139e643e 100644
--- a/library/cpp/string_utils/url/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/url/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/url/CMakeLists.linux.txt b/library/cpp/string_utils/url/CMakeLists.linux-x86_64.txt
index b84dcb3263d..b84dcb3263d 100644
--- a/library/cpp/string_utils/url/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/url/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/url/CMakeLists.txt b/library/cpp/string_utils/url/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/url/CMakeLists.txt
+++ b/library/cpp/string_utils/url/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/ztstrbuf/CMakeLists.darwin.txt b/library/cpp/string_utils/ztstrbuf/CMakeLists.darwin-x86_64.txt
index b6867602291..b6867602291 100644
--- a/library/cpp/string_utils/ztstrbuf/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/ztstrbuf/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/ztstrbuf/CMakeLists.linux.txt b/library/cpp/string_utils/ztstrbuf/CMakeLists.linux-x86_64.txt
index 370fd83097d..370fd83097d 100644
--- a/library/cpp/string_utils/ztstrbuf/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/ztstrbuf/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/ztstrbuf/CMakeLists.txt b/library/cpp/string_utils/ztstrbuf/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/string_utils/ztstrbuf/CMakeLists.txt
+++ b/library/cpp/string_utils/ztstrbuf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/svnversion/CMakeLists.darwin.txt b/library/cpp/svnversion/CMakeLists.darwin-x86_64.txt
index f767e929b8c..f767e929b8c 100644
--- a/library/cpp/svnversion/CMakeLists.darwin.txt
+++ b/library/cpp/svnversion/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/svnversion/CMakeLists.linux.txt b/library/cpp/svnversion/CMakeLists.linux-x86_64.txt
index f37d20f4d11..f37d20f4d11 100644
--- a/library/cpp/svnversion/CMakeLists.linux.txt
+++ b/library/cpp/svnversion/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/svnversion/CMakeLists.txt b/library/cpp/svnversion/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/svnversion/CMakeLists.txt
+++ b/library/cpp/svnversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/tdigest/CMakeLists.darwin.txt b/library/cpp/tdigest/CMakeLists.darwin-x86_64.txt
index 9dd7437db0a..9dd7437db0a 100644
--- a/library/cpp/tdigest/CMakeLists.darwin.txt
+++ b/library/cpp/tdigest/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/tdigest/CMakeLists.linux.txt b/library/cpp/tdigest/CMakeLists.linux-x86_64.txt
index 2fdc4b7b125..2fdc4b7b125 100644
--- a/library/cpp/tdigest/CMakeLists.linux.txt
+++ b/library/cpp/tdigest/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/tdigest/CMakeLists.txt b/library/cpp/tdigest/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/tdigest/CMakeLists.txt
+++ b/library/cpp/tdigest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/terminate_handler/CMakeLists.darwin.txt b/library/cpp/terminate_handler/CMakeLists.darwin-x86_64.txt
index 050a5323bd6..050a5323bd6 100644
--- a/library/cpp/terminate_handler/CMakeLists.darwin.txt
+++ b/library/cpp/terminate_handler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/terminate_handler/CMakeLists.linux.txt b/library/cpp/terminate_handler/CMakeLists.linux-x86_64.txt
index 48d55d42ce3..48d55d42ce3 100644
--- a/library/cpp/terminate_handler/CMakeLists.linux.txt
+++ b/library/cpp/terminate_handler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/terminate_handler/CMakeLists.txt b/library/cpp/terminate_handler/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/terminate_handler/CMakeLists.txt
+++ b/library/cpp/terminate_handler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/benchmark/CMakeLists.darwin.txt b/library/cpp/testing/benchmark/CMakeLists.darwin-x86_64.txt
index c68241bc9ec..c68241bc9ec 100644
--- a/library/cpp/testing/benchmark/CMakeLists.darwin.txt
+++ b/library/cpp/testing/benchmark/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/benchmark/CMakeLists.linux.txt b/library/cpp/testing/benchmark/CMakeLists.linux-x86_64.txt
index 84161c1c434..84161c1c434 100644
--- a/library/cpp/testing/benchmark/CMakeLists.linux.txt
+++ b/library/cpp/testing/benchmark/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/benchmark/CMakeLists.txt b/library/cpp/testing/benchmark/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/benchmark/CMakeLists.txt
+++ b/library/cpp/testing/benchmark/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/benchmark/main/CMakeLists.darwin.txt b/library/cpp/testing/benchmark/main/CMakeLists.darwin-x86_64.txt
index 15cbe3d5ac9..15cbe3d5ac9 100644
--- a/library/cpp/testing/benchmark/main/CMakeLists.darwin.txt
+++ b/library/cpp/testing/benchmark/main/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/benchmark/main/CMakeLists.linux.txt b/library/cpp/testing/benchmark/main/CMakeLists.linux-x86_64.txt
index 3f580358e35..3f580358e35 100644
--- a/library/cpp/testing/benchmark/main/CMakeLists.linux.txt
+++ b/library/cpp/testing/benchmark/main/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/benchmark/main/CMakeLists.txt b/library/cpp/testing/benchmark/main/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/benchmark/main/CMakeLists.txt
+++ b/library/cpp/testing/benchmark/main/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/common/CMakeLists.darwin.txt b/library/cpp/testing/common/CMakeLists.darwin-x86_64.txt
index c795d4ebeb0..c795d4ebeb0 100644
--- a/library/cpp/testing/common/CMakeLists.darwin.txt
+++ b/library/cpp/testing/common/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/common/CMakeLists.linux.txt b/library/cpp/testing/common/CMakeLists.linux-x86_64.txt
index 261d374dc86..261d374dc86 100644
--- a/library/cpp/testing/common/CMakeLists.linux.txt
+++ b/library/cpp/testing/common/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/common/CMakeLists.txt b/library/cpp/testing/common/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/common/CMakeLists.txt
+++ b/library/cpp/testing/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/gmock_in_unittest/CMakeLists.darwin.txt b/library/cpp/testing/gmock_in_unittest/CMakeLists.darwin-x86_64.txt
index 8a20efaed07..8a20efaed07 100644
--- a/library/cpp/testing/gmock_in_unittest/CMakeLists.darwin.txt
+++ b/library/cpp/testing/gmock_in_unittest/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/gmock_in_unittest/CMakeLists.linux.txt b/library/cpp/testing/gmock_in_unittest/CMakeLists.linux-x86_64.txt
index 29717189de7..29717189de7 100644
--- a/library/cpp/testing/gmock_in_unittest/CMakeLists.linux.txt
+++ b/library/cpp/testing/gmock_in_unittest/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/gmock_in_unittest/CMakeLists.txt b/library/cpp/testing/gmock_in_unittest/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/gmock_in_unittest/CMakeLists.txt
+++ b/library/cpp/testing/gmock_in_unittest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/gtest/CMakeLists.darwin.txt b/library/cpp/testing/gtest/CMakeLists.darwin-x86_64.txt
index 41bc7e20f92..41bc7e20f92 100644
--- a/library/cpp/testing/gtest/CMakeLists.darwin.txt
+++ b/library/cpp/testing/gtest/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/gtest/CMakeLists.linux.txt b/library/cpp/testing/gtest/CMakeLists.linux-x86_64.txt
index e172e2381a7..e172e2381a7 100644
--- a/library/cpp/testing/gtest/CMakeLists.linux.txt
+++ b/library/cpp/testing/gtest/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/gtest/CMakeLists.txt b/library/cpp/testing/gtest/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/gtest/CMakeLists.txt
+++ b/library/cpp/testing/gtest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/gtest_extensions/CMakeLists.darwin.txt b/library/cpp/testing/gtest_extensions/CMakeLists.darwin-x86_64.txt
index 3557a689eb5..3557a689eb5 100644
--- a/library/cpp/testing/gtest_extensions/CMakeLists.darwin.txt
+++ b/library/cpp/testing/gtest_extensions/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/gtest_extensions/CMakeLists.linux.txt b/library/cpp/testing/gtest_extensions/CMakeLists.linux-x86_64.txt
index fba9c841dea..fba9c841dea 100644
--- a/library/cpp/testing/gtest_extensions/CMakeLists.linux.txt
+++ b/library/cpp/testing/gtest_extensions/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/gtest_extensions/CMakeLists.txt b/library/cpp/testing/gtest_extensions/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/gtest_extensions/CMakeLists.txt
+++ b/library/cpp/testing/gtest_extensions/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/gtest_main/CMakeLists.darwin.txt b/library/cpp/testing/gtest_main/CMakeLists.darwin-x86_64.txt
index 1075010e224..1075010e224 100644
--- a/library/cpp/testing/gtest_main/CMakeLists.darwin.txt
+++ b/library/cpp/testing/gtest_main/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/gtest_main/CMakeLists.linux.txt b/library/cpp/testing/gtest_main/CMakeLists.linux-x86_64.txt
index f3ef692fb61..f3ef692fb61 100644
--- a/library/cpp/testing/gtest_main/CMakeLists.linux.txt
+++ b/library/cpp/testing/gtest_main/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/gtest_main/CMakeLists.txt b/library/cpp/testing/gtest_main/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/gtest_main/CMakeLists.txt
+++ b/library/cpp/testing/gtest_main/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/hook/CMakeLists.darwin.txt b/library/cpp/testing/hook/CMakeLists.darwin-x86_64.txt
index 14cff14af7f..14cff14af7f 100644
--- a/library/cpp/testing/hook/CMakeLists.darwin.txt
+++ b/library/cpp/testing/hook/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/hook/CMakeLists.linux.txt b/library/cpp/testing/hook/CMakeLists.linux-x86_64.txt
index ee777c46ff2..ee777c46ff2 100644
--- a/library/cpp/testing/hook/CMakeLists.linux.txt
+++ b/library/cpp/testing/hook/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/hook/CMakeLists.txt b/library/cpp/testing/hook/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/hook/CMakeLists.txt
+++ b/library/cpp/testing/hook/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/unittest/CMakeLists.darwin.txt b/library/cpp/testing/unittest/CMakeLists.darwin-x86_64.txt
index 64dc3e1a7a0..64dc3e1a7a0 100644
--- a/library/cpp/testing/unittest/CMakeLists.darwin.txt
+++ b/library/cpp/testing/unittest/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/unittest/CMakeLists.linux.txt b/library/cpp/testing/unittest/CMakeLists.linux-x86_64.txt
index 860a713a0b6..860a713a0b6 100644
--- a/library/cpp/testing/unittest/CMakeLists.linux.txt
+++ b/library/cpp/testing/unittest/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/unittest/CMakeLists.txt b/library/cpp/testing/unittest/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/unittest/CMakeLists.txt
+++ b/library/cpp/testing/unittest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/unittest_main/CMakeLists.darwin.txt b/library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt
index 47d1aa79f66..47d1aa79f66 100644
--- a/library/cpp/testing/unittest_main/CMakeLists.darwin.txt
+++ b/library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/unittest_main/CMakeLists.linux.txt b/library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt
index 38c9a6036d2..38c9a6036d2 100644
--- a/library/cpp/testing/unittest_main/CMakeLists.linux.txt
+++ b/library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/unittest_main/CMakeLists.txt b/library/cpp/testing/unittest_main/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/testing/unittest_main/CMakeLists.txt
+++ b/library/cpp/testing/unittest_main/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/atomic/CMakeLists.darwin.txt b/library/cpp/threading/atomic/CMakeLists.darwin-x86_64.txt
index d9f7098b347..d9f7098b347 100644
--- a/library/cpp/threading/atomic/CMakeLists.darwin.txt
+++ b/library/cpp/threading/atomic/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/atomic/CMakeLists.linux.txt b/library/cpp/threading/atomic/CMakeLists.linux-x86_64.txt
index a43a6589081..a43a6589081 100644
--- a/library/cpp/threading/atomic/CMakeLists.linux.txt
+++ b/library/cpp/threading/atomic/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/atomic/CMakeLists.txt b/library/cpp/threading/atomic/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/atomic/CMakeLists.txt
+++ b/library/cpp/threading/atomic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/chunk_queue/CMakeLists.darwin.txt b/library/cpp/threading/chunk_queue/CMakeLists.darwin-x86_64.txt
index 454bf560f9f..454bf560f9f 100644
--- a/library/cpp/threading/chunk_queue/CMakeLists.darwin.txt
+++ b/library/cpp/threading/chunk_queue/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/chunk_queue/CMakeLists.linux.txt b/library/cpp/threading/chunk_queue/CMakeLists.linux-x86_64.txt
index d8895e6dbfa..d8895e6dbfa 100644
--- a/library/cpp/threading/chunk_queue/CMakeLists.linux.txt
+++ b/library/cpp/threading/chunk_queue/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/chunk_queue/CMakeLists.txt b/library/cpp/threading/chunk_queue/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/chunk_queue/CMakeLists.txt
+++ b/library/cpp/threading/chunk_queue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/equeue/CMakeLists.darwin.txt b/library/cpp/threading/equeue/CMakeLists.darwin-x86_64.txt
index 902b6d7a9ac..902b6d7a9ac 100644
--- a/library/cpp/threading/equeue/CMakeLists.darwin.txt
+++ b/library/cpp/threading/equeue/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/equeue/CMakeLists.linux.txt b/library/cpp/threading/equeue/CMakeLists.linux-x86_64.txt
index 5653d3d3f3f..5653d3d3f3f 100644
--- a/library/cpp/threading/equeue/CMakeLists.linux.txt
+++ b/library/cpp/threading/equeue/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/equeue/CMakeLists.txt b/library/cpp/threading/equeue/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/equeue/CMakeLists.txt
+++ b/library/cpp/threading/equeue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/future/CMakeLists.darwin.txt b/library/cpp/threading/future/CMakeLists.darwin-x86_64.txt
index 66d221dbbb4..66d221dbbb4 100644
--- a/library/cpp/threading/future/CMakeLists.darwin.txt
+++ b/library/cpp/threading/future/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/future/CMakeLists.linux.txt b/library/cpp/threading/future/CMakeLists.linux-x86_64.txt
index ae643a1bc46..ae643a1bc46 100644
--- a/library/cpp/threading/future/CMakeLists.linux.txt
+++ b/library/cpp/threading/future/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/future/CMakeLists.txt b/library/cpp/threading/future/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/future/CMakeLists.txt
+++ b/library/cpp/threading/future/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/light_rw_lock/CMakeLists.darwin.txt b/library/cpp/threading/light_rw_lock/CMakeLists.darwin-x86_64.txt
index 934c52018ec..934c52018ec 100644
--- a/library/cpp/threading/light_rw_lock/CMakeLists.darwin.txt
+++ b/library/cpp/threading/light_rw_lock/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/light_rw_lock/CMakeLists.linux.txt b/library/cpp/threading/light_rw_lock/CMakeLists.linux-x86_64.txt
index 2f54f7fe5b7..2f54f7fe5b7 100644
--- a/library/cpp/threading/light_rw_lock/CMakeLists.linux.txt
+++ b/library/cpp/threading/light_rw_lock/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/light_rw_lock/CMakeLists.txt b/library/cpp/threading/light_rw_lock/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/light_rw_lock/CMakeLists.txt
+++ b/library/cpp/threading/light_rw_lock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/local_executor/CMakeLists.darwin.txt b/library/cpp/threading/local_executor/CMakeLists.darwin-x86_64.txt
index a88a439f243..a88a439f243 100644
--- a/library/cpp/threading/local_executor/CMakeLists.darwin.txt
+++ b/library/cpp/threading/local_executor/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/local_executor/CMakeLists.linux.txt b/library/cpp/threading/local_executor/CMakeLists.linux-x86_64.txt
index ab5a6d971f9..ab5a6d971f9 100644
--- a/library/cpp/threading/local_executor/CMakeLists.linux.txt
+++ b/library/cpp/threading/local_executor/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/local_executor/CMakeLists.txt b/library/cpp/threading/local_executor/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/local_executor/CMakeLists.txt
+++ b/library/cpp/threading/local_executor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/poor_man_openmp/CMakeLists.darwin.txt b/library/cpp/threading/poor_man_openmp/CMakeLists.darwin-x86_64.txt
index 116045cc832..116045cc832 100644
--- a/library/cpp/threading/poor_man_openmp/CMakeLists.darwin.txt
+++ b/library/cpp/threading/poor_man_openmp/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/poor_man_openmp/CMakeLists.linux.txt b/library/cpp/threading/poor_man_openmp/CMakeLists.linux-x86_64.txt
index a33df23eaca..a33df23eaca 100644
--- a/library/cpp/threading/poor_man_openmp/CMakeLists.linux.txt
+++ b/library/cpp/threading/poor_man_openmp/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/poor_man_openmp/CMakeLists.txt b/library/cpp/threading/poor_man_openmp/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/poor_man_openmp/CMakeLists.txt
+++ b/library/cpp/threading/poor_man_openmp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/queue/CMakeLists.darwin.txt b/library/cpp/threading/queue/CMakeLists.darwin-x86_64.txt
index ff0797688e7..ff0797688e7 100644
--- a/library/cpp/threading/queue/CMakeLists.darwin.txt
+++ b/library/cpp/threading/queue/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/queue/CMakeLists.linux.txt b/library/cpp/threading/queue/CMakeLists.linux-x86_64.txt
index c6338ea17b0..c6338ea17b0 100644
--- a/library/cpp/threading/queue/CMakeLists.linux.txt
+++ b/library/cpp/threading/queue/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/queue/CMakeLists.txt b/library/cpp/threading/queue/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/queue/CMakeLists.txt
+++ b/library/cpp/threading/queue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/skip_list/CMakeLists.darwin.txt b/library/cpp/threading/skip_list/CMakeLists.darwin-x86_64.txt
index e364879e721..e364879e721 100644
--- a/library/cpp/threading/skip_list/CMakeLists.darwin.txt
+++ b/library/cpp/threading/skip_list/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/skip_list/CMakeLists.linux.txt b/library/cpp/threading/skip_list/CMakeLists.linux-x86_64.txt
index 81907f6776d..81907f6776d 100644
--- a/library/cpp/threading/skip_list/CMakeLists.linux.txt
+++ b/library/cpp/threading/skip_list/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/skip_list/CMakeLists.txt b/library/cpp/threading/skip_list/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/skip_list/CMakeLists.txt
+++ b/library/cpp/threading/skip_list/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/task_scheduler/CMakeLists.darwin.txt b/library/cpp/threading/task_scheduler/CMakeLists.darwin-x86_64.txt
index 61c6127690e..61c6127690e 100644
--- a/library/cpp/threading/task_scheduler/CMakeLists.darwin.txt
+++ b/library/cpp/threading/task_scheduler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/task_scheduler/CMakeLists.linux.txt b/library/cpp/threading/task_scheduler/CMakeLists.linux-x86_64.txt
index 929d3f00db0..929d3f00db0 100644
--- a/library/cpp/threading/task_scheduler/CMakeLists.linux.txt
+++ b/library/cpp/threading/task_scheduler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/task_scheduler/CMakeLists.txt b/library/cpp/threading/task_scheduler/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/threading/task_scheduler/CMakeLists.txt
+++ b/library/cpp/threading/task_scheduler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/time_provider/CMakeLists.darwin.txt b/library/cpp/time_provider/CMakeLists.darwin-x86_64.txt
index 51060375898..51060375898 100644
--- a/library/cpp/time_provider/CMakeLists.darwin.txt
+++ b/library/cpp/time_provider/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/time_provider/CMakeLists.linux.txt b/library/cpp/time_provider/CMakeLists.linux-x86_64.txt
index e35e99bf80d..e35e99bf80d 100644
--- a/library/cpp/time_provider/CMakeLists.linux.txt
+++ b/library/cpp/time_provider/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/time_provider/CMakeLists.txt b/library/cpp/time_provider/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/time_provider/CMakeLists.txt
+++ b/library/cpp/time_provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/timezone_conversion/CMakeLists.darwin.txt b/library/cpp/timezone_conversion/CMakeLists.darwin-x86_64.txt
index 0d060c26998..0d060c26998 100644
--- a/library/cpp/timezone_conversion/CMakeLists.darwin.txt
+++ b/library/cpp/timezone_conversion/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/timezone_conversion/CMakeLists.linux.txt b/library/cpp/timezone_conversion/CMakeLists.linux-x86_64.txt
index daf50a668e5..daf50a668e5 100644
--- a/library/cpp/timezone_conversion/CMakeLists.linux.txt
+++ b/library/cpp/timezone_conversion/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/timezone_conversion/CMakeLists.txt b/library/cpp/timezone_conversion/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/timezone_conversion/CMakeLists.txt
+++ b/library/cpp/timezone_conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/tld/CMakeLists.darwin.txt b/library/cpp/tld/CMakeLists.darwin-x86_64.txt
index cf90e8b74f3..cf90e8b74f3 100644
--- a/library/cpp/tld/CMakeLists.darwin.txt
+++ b/library/cpp/tld/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/tld/CMakeLists.linux.txt b/library/cpp/tld/CMakeLists.linux-x86_64.txt
index 30fe4361801..30fe4361801 100644
--- a/library/cpp/tld/CMakeLists.linux.txt
+++ b/library/cpp/tld/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/tld/CMakeLists.txt b/library/cpp/tld/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/tld/CMakeLists.txt
+++ b/library/cpp/tld/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unicode/normalization/CMakeLists.darwin.txt b/library/cpp/unicode/normalization/CMakeLists.darwin-x86_64.txt
index faa65c7f2ba..faa65c7f2ba 100644
--- a/library/cpp/unicode/normalization/CMakeLists.darwin.txt
+++ b/library/cpp/unicode/normalization/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unicode/normalization/CMakeLists.linux.txt b/library/cpp/unicode/normalization/CMakeLists.linux-x86_64.txt
index 8f5bf5189e1..8f5bf5189e1 100644
--- a/library/cpp/unicode/normalization/CMakeLists.linux.txt
+++ b/library/cpp/unicode/normalization/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unicode/normalization/CMakeLists.txt b/library/cpp/unicode/normalization/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/unicode/normalization/CMakeLists.txt
+++ b/library/cpp/unicode/normalization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unicode/punycode/CMakeLists.darwin.txt b/library/cpp/unicode/punycode/CMakeLists.darwin-x86_64.txt
index 25c06c3bbc8..25c06c3bbc8 100644
--- a/library/cpp/unicode/punycode/CMakeLists.darwin.txt
+++ b/library/cpp/unicode/punycode/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unicode/punycode/CMakeLists.linux.txt b/library/cpp/unicode/punycode/CMakeLists.linux-x86_64.txt
index 5265c3ec303..5265c3ec303 100644
--- a/library/cpp/unicode/punycode/CMakeLists.linux.txt
+++ b/library/cpp/unicode/punycode/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unicode/punycode/CMakeLists.txt b/library/cpp/unicode/punycode/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/unicode/punycode/CMakeLists.txt
+++ b/library/cpp/unicode/punycode/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unicode/set/CMakeLists.darwin.txt b/library/cpp/unicode/set/CMakeLists.darwin-x86_64.txt
index 81e3230ffed..81e3230ffed 100644
--- a/library/cpp/unicode/set/CMakeLists.darwin.txt
+++ b/library/cpp/unicode/set/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unicode/set/CMakeLists.linux.txt b/library/cpp/unicode/set/CMakeLists.linux-x86_64.txt
index 1746645e0c3..1746645e0c3 100644
--- a/library/cpp/unicode/set/CMakeLists.linux.txt
+++ b/library/cpp/unicode/set/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unicode/set/CMakeLists.txt b/library/cpp/unicode/set/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/unicode/set/CMakeLists.txt
+++ b/library/cpp/unicode/set/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unified_agent_client/CMakeLists.darwin.txt b/library/cpp/unified_agent_client/CMakeLists.darwin-x86_64.txt
index c681f29c5b6..c681f29c5b6 100644
--- a/library/cpp/unified_agent_client/CMakeLists.darwin.txt
+++ b/library/cpp/unified_agent_client/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unified_agent_client/CMakeLists.linux.txt b/library/cpp/unified_agent_client/CMakeLists.linux-x86_64.txt
index 84821c33695..84821c33695 100644
--- a/library/cpp/unified_agent_client/CMakeLists.linux.txt
+++ b/library/cpp/unified_agent_client/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unified_agent_client/CMakeLists.txt b/library/cpp/unified_agent_client/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/unified_agent_client/CMakeLists.txt
+++ b/library/cpp/unified_agent_client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unified_agent_client/proto/CMakeLists.darwin.txt b/library/cpp/unified_agent_client/proto/CMakeLists.darwin-x86_64.txt
index 6f12b2aa5ee..6f12b2aa5ee 100644
--- a/library/cpp/unified_agent_client/proto/CMakeLists.darwin.txt
+++ b/library/cpp/unified_agent_client/proto/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unified_agent_client/proto/CMakeLists.linux.txt b/library/cpp/unified_agent_client/proto/CMakeLists.linux-x86_64.txt
index 571e21b861e..571e21b861e 100644
--- a/library/cpp/unified_agent_client/proto/CMakeLists.linux.txt
+++ b/library/cpp/unified_agent_client/proto/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unified_agent_client/proto/CMakeLists.txt b/library/cpp/unified_agent_client/proto/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/unified_agent_client/proto/CMakeLists.txt
+++ b/library/cpp/unified_agent_client/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/uri/CMakeLists.darwin.txt b/library/cpp/uri/CMakeLists.darwin-x86_64.txt
index f4437a0a2b4..f4437a0a2b4 100644
--- a/library/cpp/uri/CMakeLists.darwin.txt
+++ b/library/cpp/uri/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/uri/CMakeLists.linux.txt b/library/cpp/uri/CMakeLists.linux-x86_64.txt
index e5d2e1e2813..e5d2e1e2813 100644
--- a/library/cpp/uri/CMakeLists.linux.txt
+++ b/library/cpp/uri/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/uri/CMakeLists.txt b/library/cpp/uri/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/uri/CMakeLists.txt
+++ b/library/cpp/uri/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/xml/document/CMakeLists.darwin.txt b/library/cpp/xml/document/CMakeLists.darwin-x86_64.txt
index 78de390e21e..78de390e21e 100644
--- a/library/cpp/xml/document/CMakeLists.darwin.txt
+++ b/library/cpp/xml/document/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/xml/document/CMakeLists.linux.txt b/library/cpp/xml/document/CMakeLists.linux-x86_64.txt
index b7467715369..b7467715369 100644
--- a/library/cpp/xml/document/CMakeLists.linux.txt
+++ b/library/cpp/xml/document/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/xml/document/CMakeLists.txt b/library/cpp/xml/document/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/xml/document/CMakeLists.txt
+++ b/library/cpp/xml/document/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/xml/init/CMakeLists.darwin.txt b/library/cpp/xml/init/CMakeLists.darwin-x86_64.txt
index 15635507ff7..15635507ff7 100644
--- a/library/cpp/xml/init/CMakeLists.darwin.txt
+++ b/library/cpp/xml/init/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/xml/init/CMakeLists.linux.txt b/library/cpp/xml/init/CMakeLists.linux-x86_64.txt
index 95ea6cc73c2..95ea6cc73c2 100644
--- a/library/cpp/xml/init/CMakeLists.linux.txt
+++ b/library/cpp/xml/init/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/xml/init/CMakeLists.txt b/library/cpp/xml/init/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/xml/init/CMakeLists.txt
+++ b/library/cpp/xml/init/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yaml/as/CMakeLists.darwin.txt b/library/cpp/yaml/as/CMakeLists.darwin-x86_64.txt
index 806700a5524..806700a5524 100644
--- a/library/cpp/yaml/as/CMakeLists.darwin.txt
+++ b/library/cpp/yaml/as/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yaml/as/CMakeLists.linux.txt b/library/cpp/yaml/as/CMakeLists.linux-x86_64.txt
index 50f48acb17e..50f48acb17e 100644
--- a/library/cpp/yaml/as/CMakeLists.linux.txt
+++ b/library/cpp/yaml/as/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yaml/as/CMakeLists.txt b/library/cpp/yaml/as/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yaml/as/CMakeLists.txt
+++ b/library/cpp/yaml/as/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yaml/fyamlcpp/CMakeLists.darwin.txt b/library/cpp/yaml/fyamlcpp/CMakeLists.darwin-x86_64.txt
index ed89c6d02df..ed89c6d02df 100644
--- a/library/cpp/yaml/fyamlcpp/CMakeLists.darwin.txt
+++ b/library/cpp/yaml/fyamlcpp/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yaml/fyamlcpp/CMakeLists.linux.txt b/library/cpp/yaml/fyamlcpp/CMakeLists.linux-x86_64.txt
index e96ca3e0ecc..e96ca3e0ecc 100644
--- a/library/cpp/yaml/fyamlcpp/CMakeLists.linux.txt
+++ b/library/cpp/yaml/fyamlcpp/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yaml/fyamlcpp/CMakeLists.txt b/library/cpp/yaml/fyamlcpp/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yaml/fyamlcpp/CMakeLists.txt
+++ b/library/cpp/yaml/fyamlcpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yson/CMakeLists.darwin.txt b/library/cpp/yson/CMakeLists.darwin-x86_64.txt
index d5cda8e6c0d..d5cda8e6c0d 100644
--- a/library/cpp/yson/CMakeLists.darwin.txt
+++ b/library/cpp/yson/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yson/CMakeLists.linux.txt b/library/cpp/yson/CMakeLists.linux-x86_64.txt
index 1d4a1bd34e2..1d4a1bd34e2 100644
--- a/library/cpp/yson/CMakeLists.linux.txt
+++ b/library/cpp/yson/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yson/CMakeLists.txt b/library/cpp/yson/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yson/CMakeLists.txt
+++ b/library/cpp/yson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yson/json/CMakeLists.darwin.txt b/library/cpp/yson/json/CMakeLists.darwin-x86_64.txt
index 2b5efc5d4d1..2b5efc5d4d1 100644
--- a/library/cpp/yson/json/CMakeLists.darwin.txt
+++ b/library/cpp/yson/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yson/json/CMakeLists.linux.txt b/library/cpp/yson/json/CMakeLists.linux-x86_64.txt
index 57dce333101..57dce333101 100644
--- a/library/cpp/yson/json/CMakeLists.linux.txt
+++ b/library/cpp/yson/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yson/json/CMakeLists.txt b/library/cpp/yson/json/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yson/json/CMakeLists.txt
+++ b/library/cpp/yson/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yson/node/CMakeLists.darwin.txt b/library/cpp/yson/node/CMakeLists.darwin-x86_64.txt
index e9334e323e6..e9334e323e6 100644
--- a/library/cpp/yson/node/CMakeLists.darwin.txt
+++ b/library/cpp/yson/node/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yson/node/CMakeLists.linux.txt b/library/cpp/yson/node/CMakeLists.linux-x86_64.txt
index ddf918de7ff..ddf918de7ff 100644
--- a/library/cpp/yson/node/CMakeLists.linux.txt
+++ b/library/cpp/yson/node/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yson/node/CMakeLists.txt b/library/cpp/yson/node/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yson/node/CMakeLists.txt
+++ b/library/cpp/yson/node/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yson_pull/CMakeLists.darwin.txt b/library/cpp/yson_pull/CMakeLists.darwin-x86_64.txt
index a5c4253641d..a5c4253641d 100644
--- a/library/cpp/yson_pull/CMakeLists.darwin.txt
+++ b/library/cpp/yson_pull/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yson_pull/CMakeLists.linux.txt b/library/cpp/yson_pull/CMakeLists.linux-x86_64.txt
index b634e26c5fa..b634e26c5fa 100644
--- a/library/cpp/yson_pull/CMakeLists.linux.txt
+++ b/library/cpp/yson_pull/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yson_pull/CMakeLists.txt b/library/cpp/yson_pull/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yson_pull/CMakeLists.txt
+++ b/library/cpp/yson_pull/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/assert/CMakeLists.darwin.txt b/library/cpp/yt/assert/CMakeLists.darwin-x86_64.txt
index c2ad57e3a06..c2ad57e3a06 100644
--- a/library/cpp/yt/assert/CMakeLists.darwin.txt
+++ b/library/cpp/yt/assert/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/assert/CMakeLists.linux.txt b/library/cpp/yt/assert/CMakeLists.linux-x86_64.txt
index 0c4f0dc6c08..0c4f0dc6c08 100644
--- a/library/cpp/yt/assert/CMakeLists.linux.txt
+++ b/library/cpp/yt/assert/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/assert/CMakeLists.txt b/library/cpp/yt/assert/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/assert/CMakeLists.txt
+++ b/library/cpp/yt/assert/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/coding/CMakeLists.darwin.txt b/library/cpp/yt/coding/CMakeLists.darwin-x86_64.txt
index ad79d9654f2..ad79d9654f2 100644
--- a/library/cpp/yt/coding/CMakeLists.darwin.txt
+++ b/library/cpp/yt/coding/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/coding/CMakeLists.linux.txt b/library/cpp/yt/coding/CMakeLists.linux-x86_64.txt
index a2020a68e46..a2020a68e46 100644
--- a/library/cpp/yt/coding/CMakeLists.linux.txt
+++ b/library/cpp/yt/coding/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/coding/CMakeLists.txt b/library/cpp/yt/coding/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/coding/CMakeLists.txt
+++ b/library/cpp/yt/coding/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/exception/CMakeLists.darwin.txt b/library/cpp/yt/exception/CMakeLists.darwin-x86_64.txt
index f40a29467d0..f40a29467d0 100644
--- a/library/cpp/yt/exception/CMakeLists.darwin.txt
+++ b/library/cpp/yt/exception/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/exception/CMakeLists.linux.txt b/library/cpp/yt/exception/CMakeLists.linux-x86_64.txt
index 780e571ddc3..780e571ddc3 100644
--- a/library/cpp/yt/exception/CMakeLists.linux.txt
+++ b/library/cpp/yt/exception/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/exception/CMakeLists.txt b/library/cpp/yt/exception/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/exception/CMakeLists.txt
+++ b/library/cpp/yt/exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/malloc/CMakeLists.darwin.txt b/library/cpp/yt/malloc/CMakeLists.darwin-x86_64.txt
index 1d843305d98..1d843305d98 100644
--- a/library/cpp/yt/malloc/CMakeLists.darwin.txt
+++ b/library/cpp/yt/malloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/malloc/CMakeLists.linux.txt b/library/cpp/yt/malloc/CMakeLists.linux-x86_64.txt
index 40c26cadfba..40c26cadfba 100644
--- a/library/cpp/yt/malloc/CMakeLists.linux.txt
+++ b/library/cpp/yt/malloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/malloc/CMakeLists.txt b/library/cpp/yt/malloc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/malloc/CMakeLists.txt
+++ b/library/cpp/yt/malloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/memory/CMakeLists.darwin.txt b/library/cpp/yt/memory/CMakeLists.darwin-x86_64.txt
index 30fdfbef100..30fdfbef100 100644
--- a/library/cpp/yt/memory/CMakeLists.darwin.txt
+++ b/library/cpp/yt/memory/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/memory/CMakeLists.linux.txt b/library/cpp/yt/memory/CMakeLists.linux-x86_64.txt
index 7325ab2c740..7325ab2c740 100644
--- a/library/cpp/yt/memory/CMakeLists.linux.txt
+++ b/library/cpp/yt/memory/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/memory/CMakeLists.txt b/library/cpp/yt/memory/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/memory/CMakeLists.txt
+++ b/library/cpp/yt/memory/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/misc/CMakeLists.darwin.txt b/library/cpp/yt/misc/CMakeLists.darwin-x86_64.txt
index 92907b63dc2..92907b63dc2 100644
--- a/library/cpp/yt/misc/CMakeLists.darwin.txt
+++ b/library/cpp/yt/misc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/misc/CMakeLists.linux.txt b/library/cpp/yt/misc/CMakeLists.linux-x86_64.txt
index 9ed005067b4..9ed005067b4 100644
--- a/library/cpp/yt/misc/CMakeLists.linux.txt
+++ b/library/cpp/yt/misc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/misc/CMakeLists.txt b/library/cpp/yt/misc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/misc/CMakeLists.txt
+++ b/library/cpp/yt/misc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/small_containers/CMakeLists.darwin.txt b/library/cpp/yt/small_containers/CMakeLists.darwin-x86_64.txt
index 7f0c283498a..7f0c283498a 100644
--- a/library/cpp/yt/small_containers/CMakeLists.darwin.txt
+++ b/library/cpp/yt/small_containers/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/small_containers/CMakeLists.linux.txt b/library/cpp/yt/small_containers/CMakeLists.linux-x86_64.txt
index bc2b88bf401..bc2b88bf401 100644
--- a/library/cpp/yt/small_containers/CMakeLists.linux.txt
+++ b/library/cpp/yt/small_containers/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/small_containers/CMakeLists.txt b/library/cpp/yt/small_containers/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/small_containers/CMakeLists.txt
+++ b/library/cpp/yt/small_containers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/string/CMakeLists.darwin.txt b/library/cpp/yt/string/CMakeLists.darwin-x86_64.txt
index 77a9e8a268f..77a9e8a268f 100644
--- a/library/cpp/yt/string/CMakeLists.darwin.txt
+++ b/library/cpp/yt/string/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/string/CMakeLists.linux.txt b/library/cpp/yt/string/CMakeLists.linux-x86_64.txt
index cfafefd2b17..cfafefd2b17 100644
--- a/library/cpp/yt/string/CMakeLists.linux.txt
+++ b/library/cpp/yt/string/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/string/CMakeLists.txt b/library/cpp/yt/string/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/string/CMakeLists.txt
+++ b/library/cpp/yt/string/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/yson/CMakeLists.darwin.txt b/library/cpp/yt/yson/CMakeLists.darwin-x86_64.txt
index 68ae5dcaaf7..68ae5dcaaf7 100644
--- a/library/cpp/yt/yson/CMakeLists.darwin.txt
+++ b/library/cpp/yt/yson/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/yson/CMakeLists.linux.txt b/library/cpp/yt/yson/CMakeLists.linux-x86_64.txt
index 0aa2b791227..0aa2b791227 100644
--- a/library/cpp/yt/yson/CMakeLists.linux.txt
+++ b/library/cpp/yt/yson/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/yson/CMakeLists.txt b/library/cpp/yt/yson/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/yson/CMakeLists.txt
+++ b/library/cpp/yt/yson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/yson_string/CMakeLists.darwin.txt b/library/cpp/yt/yson_string/CMakeLists.darwin-x86_64.txt
index 31253becd72..31253becd72 100644
--- a/library/cpp/yt/yson_string/CMakeLists.darwin.txt
+++ b/library/cpp/yt/yson_string/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/yson_string/CMakeLists.linux.txt b/library/cpp/yt/yson_string/CMakeLists.linux-x86_64.txt
index 4e3045fc6aa..4e3045fc6aa 100644
--- a/library/cpp/yt/yson_string/CMakeLists.linux.txt
+++ b/library/cpp/yt/yson_string/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/yson_string/CMakeLists.txt b/library/cpp/yt/yson_string/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/yt/yson_string/CMakeLists.txt
+++ b/library/cpp/yt/yson_string/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/ytalloc/api/CMakeLists.darwin.txt b/library/cpp/ytalloc/api/CMakeLists.darwin-x86_64.txt
index a550e54f001..a550e54f001 100644
--- a/library/cpp/ytalloc/api/CMakeLists.darwin.txt
+++ b/library/cpp/ytalloc/api/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/ytalloc/api/CMakeLists.linux.txt b/library/cpp/ytalloc/api/CMakeLists.linux-x86_64.txt
index 3557a63ea82..3557a63ea82 100644
--- a/library/cpp/ytalloc/api/CMakeLists.linux.txt
+++ b/library/cpp/ytalloc/api/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/ytalloc/api/CMakeLists.txt b/library/cpp/ytalloc/api/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/library/cpp/ytalloc/api/CMakeLists.txt
+++ b/library/cpp/ytalloc/api/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()