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 2e5648a15c..2e5648a15c 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 2e5648a15c..2e5648a15c 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 eee324bb60..8f8c04afe5 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 6d68faefed..6d68faefed 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 d168ea5295..d168ea5295 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 eee324bb60..8f8c04afe5 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 7fe4e2c2ff..7fe4e2c2ff 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 e2a6cc1f08..e2a6cc1f08 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 eee324bb60..8f8c04afe5 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 539f17a1a2..539f17a1a2 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 03a286a663..03a286a663 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 eee324bb60..8f8c04afe5 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 341f9e7593..341f9e7593 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 202d9028bc..202d9028bc 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 eee324bb60..8f8c04afe5 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 16ecfc7b98..16ecfc7b98 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 b00db82fde..b00db82fde 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 eee324bb60..8f8c04afe5 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 c60599beaa..c60599beaa 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 d6e3868652..d6e3868652 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 eee324bb60..8f8c04afe5 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 49ad9e634b..49ad9e634b 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 255f935cda..255f935cda 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 eee324bb60..8f8c04afe5 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 c29d87b0ce..c29d87b0ce 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 85d0cf4696..85d0cf4696 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 eee324bb60..8f8c04afe5 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 2845e78e35..2845e78e35 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 15786d6c74..15786d6c74 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 eee324bb60..8f8c04afe5 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 5109f0fcce..5109f0fcce 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 1fa79db3ff..1fa79db3ff 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 eee324bb60..8f8c04afe5 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 9ee960950d..9ee960950d 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 a7ee6c9586..a7ee6c9586 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 eee324bb60..8f8c04afe5 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 be3257b127..be3257b127 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 a9da706400..a9da706400 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 eee324bb60..8f8c04afe5 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 1508c82e9b..1508c82e9b 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 68cb3d3199..68cb3d3199 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 eee324bb60..8f8c04afe5 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 2bac6f5b8a..2bac6f5b8a 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 9eebd23475..9eebd23475 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 eee324bb60..8f8c04afe5 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 45704ccd5a..45704ccd5a 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 ccc87489ae..ccc87489ae 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 eee324bb60..8f8c04afe5 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 5e21c8ffc3..5e21c8ffc3 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 d12c55767a..d12c55767a 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 eee324bb60..8f8c04afe5 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 37c28ba02a..37c28ba02a 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 03631029dd..03631029dd 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 eee324bb60..8f8c04afe5 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 08814068d1..08814068d1 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 8b703ab6d4..8b703ab6d4 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 eee324bb60..8f8c04afe5 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 0444876681..0444876681 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 78dd3d4b90..78dd3d4b90 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 eee324bb60..8f8c04afe5 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 37f588f7f7..37f588f7f7 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 aa604e5d20..aa604e5d20 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 eee324bb60..8f8c04afe5 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 3430226be1..3430226be1 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 1a5048d32f..1a5048d32f 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 eee324bb60..8f8c04afe5 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 3e27b7a842..3e27b7a842 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 35dab036ed..35dab036ed 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 eee324bb60..8f8c04afe5 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 3b5f212510..3b5f212510 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 4b75027197..4b75027197 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 eee324bb60..8f8c04afe5 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 0af596c5de..0af596c5de 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 ccb11a5288..ccb11a5288 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 eee324bb60..8f8c04afe5 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 fd7180543c..fd7180543c 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 cb9bd53db1..cb9bd53db1 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 eee324bb60..8f8c04afe5 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 0acda91a4d..0acda91a4d 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 841e41dc33..841e41dc33 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 eee324bb60..8f8c04afe5 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 c6d20bf8fc..c6d20bf8fc 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 e0dbc8de82..e0dbc8de82 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 eee324bb60..8f8c04afe5 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 92e6f5f9db..92e6f5f9db 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 0d4874b329..0d4874b329 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 eee324bb60..8f8c04afe5 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 acaf2f9e8d..acaf2f9e8d 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 0fee0bb18d..0fee0bb18d 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 eee324bb60..8f8c04afe5 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 995fd58dfc..995fd58dfc 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 de6eef3de0..de6eef3de0 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 eee324bb60..8f8c04afe5 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 2e13dbce8c..2e13dbce8c 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 22fe89535f..22fe89535f 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 eee324bb60..8f8c04afe5 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 894ad9b9a8..894ad9b9a8 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 46c472e81f..46c472e81f 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 eee324bb60..8f8c04afe5 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 c49c7d01b8..c49c7d01b8 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 407f8f62e1..407f8f62e1 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 eee324bb60..8f8c04afe5 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 64ef18e5d9..64ef18e5d9 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 249edbf20a..249edbf20a 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 eee324bb60..8f8c04afe5 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 a749cac8a0..a749cac8a0 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 7067bdf107..7067bdf107 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 eee324bb60..8f8c04afe5 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 82cae52ee2..82cae52ee2 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 4278ad1c77..4278ad1c77 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 eee324bb60..8f8c04afe5 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 d6d3602e2d..d6d3602e2d 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 d02118b8f7..d02118b8f7 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 eee324bb60..8f8c04afe5 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 186d00a938..186d00a938 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 eec57f881a..eec57f881a 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 eee324bb60..8f8c04afe5 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 2be179087c..2be179087c 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 b2e97648f9..b2e97648f9 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 eee324bb60..8f8c04afe5 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 2bc3133ce1..2bc3133ce1 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 e70090edcb..e70090edcb 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 eee324bb60..8f8c04afe5 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 7f06cf83d8..7f06cf83d8 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 734416a527..734416a527 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 eee324bb60..8f8c04afe5 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 a47c86d7ea..a47c86d7ea 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 d407d96e14..d407d96e14 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 eee324bb60..8f8c04afe5 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 abcc95d486..abcc95d486 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 f7c1ee7be7..f7c1ee7be7 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 eee324bb60..8f8c04afe5 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 e695ca6521..e695ca6521 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 d438e07d93..d438e07d93 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 eee324bb60..8f8c04afe5 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 23c772e4fc..23c772e4fc 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 3e91ece220..3e91ece220 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 eee324bb60..8f8c04afe5 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 c1371c0def..c1371c0def 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 25140f3dc9..25140f3dc9 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 eee324bb60..8f8c04afe5 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 4ab79d02db..4ab79d02db 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 379fc48361..379fc48361 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 eee324bb60..8f8c04afe5 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 d0486e1c36..d0486e1c36 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 2db431da3f..2db431da3f 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 eee324bb60..8f8c04afe5 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 97b139a7fa..97b139a7fa 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 758be4fd4c..758be4fd4c 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 eee324bb60..8f8c04afe5 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 57d3af0a1b..57d3af0a1b 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 a2171479e9..a2171479e9 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 eee324bb60..8f8c04afe5 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 3a3d86aed7..3a3d86aed7 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 599cc37088..599cc37088 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 eee324bb60..8f8c04afe5 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 1fd4597d59..1fd4597d59 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 c62ad5f23c..c62ad5f23c 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 eee324bb60..8f8c04afe5 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 17eb5a21b7..17eb5a21b7 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 d5ab2865c7..d5ab2865c7 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 eee324bb60..8f8c04afe5 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 651df561c1..651df561c1 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 b558f155bc..b558f155bc 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 eee324bb60..8f8c04afe5 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 45d7acb838..45d7acb838 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 82927607d1..82927607d1 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 eee324bb60..8f8c04afe5 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 c44af664bc..c44af664bc 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 b1f740cc45..b1f740cc45 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 eee324bb60..8f8c04afe5 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 490e1427d4..490e1427d4 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 59e7ab0928..59e7ab0928 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 eee324bb60..8f8c04afe5 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 e1438df974..e1438df974 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 8af3de1300..8af3de1300 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 eee324bb60..8f8c04afe5 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 83fde56a05..83fde56a05 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 1d3d430a32..1d3d430a32 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 eee324bb60..8f8c04afe5 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 2950b6b535..2950b6b535 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 c4bb46961f..c4bb46961f 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 eee324bb60..8f8c04afe5 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 ee42c250c6..ee42c250c6 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 e78f115ba1..e78f115ba1 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 eee324bb60..8f8c04afe5 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 cc2996b511..cc2996b511 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 0549b8da46..0549b8da46 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 eee324bb60..8f8c04afe5 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 d709a1e943..d709a1e943 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 b2912afd4c..b2912afd4c 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 eee324bb60..8f8c04afe5 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 125cb4b2ed..125cb4b2ed 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 6e1b4b95d1..6e1b4b95d1 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 eee324bb60..8f8c04afe5 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 73f1df8e6f..73f1df8e6f 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 1e9530b77d..1e9530b77d 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 eee324bb60..8f8c04afe5 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 78664f1ffe..78664f1ffe 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 a45f22e5e3..a45f22e5e3 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 0f8cf0fb16..a603bef54e 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 6e29430ec2..6e29430ec2 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 1e819ca723..1e819ca723 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 eee324bb60..8f8c04afe5 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 62226eb559..62226eb559 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 0d8a3a9ed2..0d8a3a9ed2 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 eee324bb60..8f8c04afe5 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 411024be15..411024be15 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 29db7b690f..29db7b690f 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 eee324bb60..8f8c04afe5 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 3ec6a99b97..3ec6a99b97 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 255bbbe453..255bbbe453 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 eee324bb60..8f8c04afe5 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 1a8b825dad..1a8b825dad 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 ed7a436e3c..ed7a436e3c 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 eee324bb60..8f8c04afe5 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 d23b1620f7..d23b1620f7 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 4851ba6aba..4851ba6aba 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 eee324bb60..8f8c04afe5 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 f6c4677907..f6c4677907 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 47ba972f0f..47ba972f0f 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 eee324bb60..8f8c04afe5 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 7b132051da..7b132051da 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 2eafc5fe69..2eafc5fe69 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 eee324bb60..8f8c04afe5 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 e2dbc9ace9..e2dbc9ace9 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 b0bc4fd1cd..b0bc4fd1cd 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 eee324bb60..8f8c04afe5 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 63474af49f..63474af49f 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 390ba10548..390ba10548 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 eee324bb60..8f8c04afe5 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 7e8d1fcb36..7e8d1fcb36 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 f6df186ad2..f6df186ad2 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 eee324bb60..8f8c04afe5 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 e34d1b9065..e34d1b9065 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 e34d1b9065..e34d1b9065 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 eee324bb60..8f8c04afe5 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 6242e299b8..6242e299b8 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 1f954bb636..1f954bb636 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 0f8cf0fb16..a603bef54e 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 bb153d887a..bb153d887a 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 a5caf518c9..a5caf518c9 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 eee324bb60..8f8c04afe5 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 f4ed53513c..f4ed53513c 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 0f6d317b77..0f6d317b77 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 eee324bb60..8f8c04afe5 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 7b57a5e09b..7b57a5e09b 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 3c12d16117..3c12d16117 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 0f8cf0fb16..a603bef54e 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 48f772826d..48f772826d 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 602f000ee5..602f000ee5 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 0f8cf0fb16..a603bef54e 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 8c1d2591ed..8c1d2591ed 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 b70cc4d942..b70cc4d942 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 0f8cf0fb16..a603bef54e 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 b4468ed351..b4468ed351 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 1ef3f3119d..1ef3f3119d 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 eee324bb60..8f8c04afe5 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 295652eae0..295652eae0 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 8d93b2e289..8d93b2e289 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 eee324bb60..8f8c04afe5 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 5ab4c75fd0..5ab4c75fd0 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 f4bbc65bf6..f4bbc65bf6 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 eee324bb60..8f8c04afe5 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 bbf3a1fc1e..bbf3a1fc1e 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 86eead7bfa..86eead7bfa 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 eee324bb60..8f8c04afe5 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 ac2e722ed8..ac2e722ed8 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 71c5ec831d..71c5ec831d 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 eee324bb60..8f8c04afe5 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 a4caa8c756..a4caa8c756 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 a0883b65f5..a0883b65f5 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 eee324bb60..8f8c04afe5 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 8449364983..8449364983 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 ed861d121c..ed861d121c 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 eee324bb60..8f8c04afe5 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 53ca09e84e..53ca09e84e 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 833aa8c016..833aa8c016 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 eee324bb60..8f8c04afe5 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 c91919f085..c91919f085 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 e2f9b3b08a..e2f9b3b08a 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 eee324bb60..8f8c04afe5 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 ff3bed8f5b..ff3bed8f5b 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 29fb5e0956..29fb5e0956 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 eee324bb60..8f8c04afe5 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 ec649dc8ad..ec649dc8ad 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 208b93382b..208b93382b 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 eee324bb60..8f8c04afe5 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 96041aa7d2..96041aa7d2 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 7b7157919a..7b7157919a 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 eee324bb60..8f8c04afe5 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 04c5b67dda..04c5b67dda 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 5aabced8a3..5aabced8a3 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 eee324bb60..8f8c04afe5 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 db6f6bfdc1..db6f6bfdc1 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 80f660d62e..80f660d62e 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 eee324bb60..8f8c04afe5 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 1db6667068..1db6667068 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 afeac13dc1..afeac13dc1 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 eee324bb60..8f8c04afe5 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 1e710ad49a..1e710ad49a 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 0d8763b93d..0d8763b93d 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 eee324bb60..8f8c04afe5 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 82fb24cb78..82fb24cb78 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 089ec72973..089ec72973 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 eee324bb60..8f8c04afe5 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 ff0b6ce0f9..ff0b6ce0f9 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 c2746fae77..c2746fae77 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 eee324bb60..8f8c04afe5 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 cf961268fa..cf961268fa 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 66b62a62a9..66b62a62a9 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 eee324bb60..8f8c04afe5 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 890dac1539..890dac1539 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 1a4747c4e3..1a4747c4e3 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 eee324bb60..8f8c04afe5 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 0efffd69e0..0efffd69e0 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 c6a073acaf..c6a073acaf 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 eee324bb60..8f8c04afe5 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 b507fb8c2e..b507fb8c2e 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 432831775a..432831775a 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 eee324bb60..8f8c04afe5 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 1f1eab359c..1f1eab359c 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 fb6cf45467..fb6cf45467 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 eee324bb60..8f8c04afe5 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 c909854a9a..c909854a9a 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 026af90992..026af90992 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 eee324bb60..8f8c04afe5 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 9d8b2182ba..9d8b2182ba 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 be781cf25a..be781cf25a 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 eee324bb60..8f8c04afe5 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 68c2fb64a3..68c2fb64a3 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 970d858e0e..970d858e0e 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 eee324bb60..8f8c04afe5 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 5a180602bc..5a180602bc 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 bbbb9103f6..bbbb9103f6 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 eee324bb60..8f8c04afe5 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 cdc5d289ee..cdc5d289ee 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 504a4558f7..504a4558f7 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 eee324bb60..8f8c04afe5 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 78a4d06b4b..78a4d06b4b 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 65648f12ee..65648f12ee 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 eee324bb60..8f8c04afe5 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 6156f5cbe2..6156f5cbe2 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 478d0655cf..478d0655cf 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 eee324bb60..8f8c04afe5 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 ee33c74cea..ee33c74cea 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 5fb04be066..5fb04be066 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 eee324bb60..8f8c04afe5 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 bbf8222242..bbf8222242 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 d55c7d2c3b..d55c7d2c3b 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 eee324bb60..8f8c04afe5 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 3fc903e74d..3fc903e74d 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 e957a68917..e957a68917 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 eee324bb60..8f8c04afe5 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 18daf19913..18daf19913 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 604119958d..604119958d 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 eee324bb60..8f8c04afe5 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 441d602ca7..441d602ca7 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 5a75c7a88f..5a75c7a88f 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 eee324bb60..8f8c04afe5 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 e164da14c0..e164da14c0 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 7793777f86..7793777f86 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 eee324bb60..8f8c04afe5 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 9f16a5a41e..9f16a5a41e 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 b34d62f0e9..b34d62f0e9 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 eee324bb60..8f8c04afe5 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 52cb38d674..52cb38d674 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 6c570438f2..6c570438f2 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 eee324bb60..8f8c04afe5 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 c5ee648844..c5ee648844 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 de6f97ec6a..de6f97ec6a 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 eee324bb60..8f8c04afe5 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 b94d19ad32..b94d19ad32 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 d215bfaccc..d215bfaccc 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 eee324bb60..8f8c04afe5 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 ec8b8ba23b..ec8b8ba23b 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 05ee5297ba..05ee5297ba 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 eee324bb60..8f8c04afe5 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 ab5c2e2e91..ab5c2e2e91 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 270d5d94da..5bedd04e09 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 db574777d6..db574777d6 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 154199c952..154199c952 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 eee324bb60..8f8c04afe5 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 92cf5b5d93..92cf5b5d93 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 7656dd6861..7656dd6861 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 eee324bb60..8f8c04afe5 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 4056287548..4056287548 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 708e01ed3a..708e01ed3a 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 eee324bb60..8f8c04afe5 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 7dc3bec75b..7dc3bec75b 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 e32791dfac..e32791dfac 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 eee324bb60..8f8c04afe5 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 370dbb17fd..370dbb17fd 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 c16204ed5a..c16204ed5a 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 eee324bb60..8f8c04afe5 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 84ce12f208..84ce12f208 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 7f31cfc6fe..7f31cfc6fe 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 eee324bb60..8f8c04afe5 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 f1a03a5f4a..f1a03a5f4a 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 21c332ae9c..21c332ae9c 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 eee324bb60..8f8c04afe5 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 9caa6f58bf..9caa6f58bf 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 f9321305c1..f9321305c1 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 eee324bb60..8f8c04afe5 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 5d8a4de4f7..5d8a4de4f7 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 974a53462b..974a53462b 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 eee324bb60..8f8c04afe5 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 db837d83de..db837d83de 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 6b81b89d4c..6b81b89d4c 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 eee324bb60..8f8c04afe5 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 ea1e085b74..ea1e085b74 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 f4c156bc0c..f4c156bc0c 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 eee324bb60..8f8c04afe5 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 72c039454c..72c039454c 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 270d5d94da..5bedd04e09 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 be15c6c305..be15c6c305 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 ba630c0cc4..4349073206 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 af2b7a2008..af2b7a2008 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 e27549d923..e27549d923 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 eee324bb60..8f8c04afe5 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 da26bb12a8..da26bb12a8 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 c14195e952..c14195e952 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 eee324bb60..8f8c04afe5 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 2ac52c60e8..2ac52c60e8 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 0414cabc63..0414cabc63 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 eee324bb60..8f8c04afe5 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 0a5f1f8502..0a5f1f8502 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 d7ac9c9c03..d7ac9c9c03 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 eee324bb60..8f8c04afe5 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 11b6ead04d..11b6ead04d 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 8e3de5c67f..8e3de5c67f 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 eee324bb60..8f8c04afe5 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 8566a4b7ef..8566a4b7ef 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 e235083392..e235083392 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 eee324bb60..8f8c04afe5 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 510bc01bd5..510bc01bd5 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 51187c45a4..51187c45a4 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 eee324bb60..8f8c04afe5 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 2d41aa3305..2d41aa3305 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 fdc6d5d131..fdc6d5d131 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 eee324bb60..8f8c04afe5 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 8e4011a982..8e4011a982 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 85364f7595..85364f7595 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 eee324bb60..8f8c04afe5 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 6bcb22f8cc..6bcb22f8cc 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 c7cb3720d3..c7cb3720d3 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 eee324bb60..8f8c04afe5 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 35f39a552a..35f39a552a 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 79ee1ffe0b..79ee1ffe0b 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 eee324bb60..8f8c04afe5 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 fa99d9dc2f..fa99d9dc2f 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 b6a771543e..b6a771543e 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 eee324bb60..8f8c04afe5 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 a74b6d023d..a74b6d023d 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 6c319f9b68..6c319f9b68 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 eee324bb60..8f8c04afe5 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 e867afbb8c..e867afbb8c 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 211beb8b27..211beb8b27 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 eee324bb60..8f8c04afe5 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 55a0abe1c3..55a0abe1c3 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 6086064a85..6086064a85 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 eee324bb60..8f8c04afe5 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 bce491e67e..bce491e67e 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 a86da32e11..a86da32e11 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 eee324bb60..8f8c04afe5 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 2db649e693..2db649e693 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 7c76369bd9..7c76369bd9 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 eee324bb60..8f8c04afe5 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 9eccd0b629..9eccd0b629 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 118b926638..118b926638 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 eee324bb60..8f8c04afe5 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 58143a2371..58143a2371 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 3089820d80..3089820d80 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 eee324bb60..8f8c04afe5 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 94cb28420f..94cb28420f 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 f1bd66c0da..f1bd66c0da 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 eee324bb60..8f8c04afe5 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 cae48e0a83..cae48e0a83 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 98f2b23c77..98f2b23c77 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 eee324bb60..8f8c04afe5 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 052ed067e1..052ed067e1 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 eb18b40c18..eb18b40c18 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 eee324bb60..8f8c04afe5 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 48ffa45b49..48ffa45b49 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 22d00e4e17..22d00e4e17 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 eee324bb60..8f8c04afe5 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 062d269d30..062d269d30 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 099a0191ef..099a0191ef 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 eee324bb60..8f8c04afe5 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 516c919f8a..516c919f8a 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 7e88b02a4b..7e88b02a4b 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 eee324bb60..8f8c04afe5 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 ca761a26c8..ca761a26c8 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 7db2f54c16..7db2f54c16 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 eee324bb60..8f8c04afe5 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 f0e455f3aa..f0e455f3aa 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 59f7ba41c4..59f7ba41c4 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 eee324bb60..8f8c04afe5 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 1ba4d2cebf..1ba4d2cebf 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 cf53e73239..cf53e73239 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 eee324bb60..8f8c04afe5 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 51c040ccd3..51c040ccd3 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 e932afdd60..e932afdd60 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 eee324bb60..8f8c04afe5 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 fcca44537e..fcca44537e 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 fab526fe7e..fab526fe7e 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 eee324bb60..8f8c04afe5 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 9e3e6c0b53..9e3e6c0b53 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 d2705961bd..d2705961bd 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 eee324bb60..8f8c04afe5 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 59f8cfcaf5..59f8cfcaf5 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 6e4c5cd6b5..6e4c5cd6b5 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 eee324bb60..8f8c04afe5 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 30961489be..30961489be 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 5aac2bc61f..5aac2bc61f 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 eee324bb60..8f8c04afe5 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 5f8c72b28c..5f8c72b28c 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 da006d6682..da006d6682 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 eee324bb60..8f8c04afe5 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 61799c97ff..61799c97ff 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 0c2bd62d47..0c2bd62d47 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 eee324bb60..8f8c04afe5 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 5eb786fb5b..5eb786fb5b 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 6fce8bebb0..6fce8bebb0 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 eee324bb60..8f8c04afe5 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 51b65cd5b9..51b65cd5b9 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 9ab7bb59e9..9ab7bb59e9 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 eee324bb60..8f8c04afe5 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 7a58b4bfeb..7a58b4bfeb 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 5f08e7a691..5f08e7a691 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 eee324bb60..8f8c04afe5 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 ac70e71b91..ac70e71b91 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 797bda818a..797bda818a 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 eee324bb60..8f8c04afe5 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 6e2a4fabcd..6e2a4fabcd 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 6e2a4fabcd..6e2a4fabcd 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 eee324bb60..8f8c04afe5 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 47150388a7..47150388a7 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 8c71567f3a..8c71567f3a 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 0f8cf0fb16..a603bef54e 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 8e01e97c1d..8e01e97c1d 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 f526317f26..f526317f26 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 eee324bb60..8f8c04afe5 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 f1fde4acf6..f1fde4acf6 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 9c4715c689..9c4715c689 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 eee324bb60..8f8c04afe5 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 a73bc8800f..a73bc8800f 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 e569656a95..e569656a95 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 eee324bb60..8f8c04afe5 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 5cfb972bb5..5cfb972bb5 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 ca2003e310..ca2003e310 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 eee324bb60..8f8c04afe5 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 ba41965df2..ba41965df2 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 3c4f9aed25..3c4f9aed25 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 eee324bb60..8f8c04afe5 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 851add2e6c..851add2e6c 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 39139ce3c8..39139ce3c8 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 eee324bb60..8f8c04afe5 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 3f330b9bb5..3f330b9bb5 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 73b4b95275..73b4b95275 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 eee324bb60..8f8c04afe5 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 15be6f0095..15be6f0095 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 110e2807e9..110e2807e9 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 eee324bb60..8f8c04afe5 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 dbd80b1e0c..dbd80b1e0c 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 9266eb99ae..9266eb99ae 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 eee324bb60..8f8c04afe5 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 7102715952..7102715952 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 37e5df6e79..37e5df6e79 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 eee324bb60..8f8c04afe5 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 5afa320647..5afa320647 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 d8cfeb870f..d8cfeb870f 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 eee324bb60..8f8c04afe5 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 3e5c652aee..3e5c652aee 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 3893a3ea8b..3893a3ea8b 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 eee324bb60..8f8c04afe5 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 e0ddfec96c..e0ddfec96c 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 557f29655b..557f29655b 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 eee324bb60..8f8c04afe5 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 9a3521cd9b..9a3521cd9b 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 a48d43f3fd..a48d43f3fd 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 eee324bb60..8f8c04afe5 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 d4f74e8dc0..d4f74e8dc0 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 d5a19ed8ea..d5a19ed8ea 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 eee324bb60..8f8c04afe5 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 d50b571fde..d50b571fde 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 c5389658b1..c5389658b1 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 eee324bb60..8f8c04afe5 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 6eca107f7f..6eca107f7f 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 afeec637dd..afeec637dd 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 eee324bb60..8f8c04afe5 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 0d86ce0e67..0d86ce0e67 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 18f5590ef9..18f5590ef9 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 eee324bb60..8f8c04afe5 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 5cd758efec..5cd758efec 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 c50fd344c4..c50fd344c4 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 eee324bb60..8f8c04afe5 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 e2bedf1e18..e2bedf1e18 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 28d1aabe8d..28d1aabe8d 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 eee324bb60..8f8c04afe5 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 14901bec18..14901bec18 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 6e952b8940..6e952b8940 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 eee324bb60..8f8c04afe5 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 3d7752c1ff..3d7752c1ff 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 4359ec58c0..4359ec58c0 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 eee324bb60..8f8c04afe5 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 672139e643..672139e643 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 b84dcb3263..b84dcb3263 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 eee324bb60..8f8c04afe5 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 b686760229..b686760229 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 370fd83097..370fd83097 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 eee324bb60..8f8c04afe5 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 f767e929b8..f767e929b8 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 f37d20f4d1..f37d20f4d1 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 eee324bb60..8f8c04afe5 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 9dd7437db0..9dd7437db0 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 2fdc4b7b12..2fdc4b7b12 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 eee324bb60..8f8c04afe5 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 050a5323bd..050a5323bd 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 48d55d42ce..48d55d42ce 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 eee324bb60..8f8c04afe5 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 c68241bc9e..c68241bc9e 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 84161c1c43..84161c1c43 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 eee324bb60..8f8c04afe5 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 15cbe3d5ac..15cbe3d5ac 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 3f580358e3..3f580358e3 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 eee324bb60..8f8c04afe5 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 c795d4ebeb..c795d4ebeb 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 261d374dc8..261d374dc8 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 eee324bb60..8f8c04afe5 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 8a20efaed0..8a20efaed0 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 29717189de..29717189de 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 eee324bb60..8f8c04afe5 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 41bc7e20f9..41bc7e20f9 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 e172e2381a..e172e2381a 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 eee324bb60..8f8c04afe5 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 3557a689eb..3557a689eb 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 fba9c841de..fba9c841de 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 eee324bb60..8f8c04afe5 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 1075010e22..1075010e22 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 f3ef692fb6..f3ef692fb6 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 eee324bb60..8f8c04afe5 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 14cff14af7..14cff14af7 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 ee777c46ff..ee777c46ff 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 eee324bb60..8f8c04afe5 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 64dc3e1a7a..64dc3e1a7a 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 860a713a0b..860a713a0b 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 eee324bb60..8f8c04afe5 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 47d1aa79f6..47d1aa79f6 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 38c9a6036d..38c9a6036d 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 eee324bb60..8f8c04afe5 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 d9f7098b34..d9f7098b34 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 a43a658908..a43a658908 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 eee324bb60..8f8c04afe5 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 454bf560f9..454bf560f9 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 d8895e6dbf..d8895e6dbf 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 eee324bb60..8f8c04afe5 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 902b6d7a9a..902b6d7a9a 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 5653d3d3f3..5653d3d3f3 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 eee324bb60..8f8c04afe5 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 66d221dbbb..66d221dbbb 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 ae643a1bc4..ae643a1bc4 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 eee324bb60..8f8c04afe5 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 934c52018e..934c52018e 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 2f54f7fe5b..2f54f7fe5b 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 eee324bb60..8f8c04afe5 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 a88a439f24..a88a439f24 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 ab5a6d971f..ab5a6d971f 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 eee324bb60..8f8c04afe5 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 116045cc83..116045cc83 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 a33df23eac..a33df23eac 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 eee324bb60..8f8c04afe5 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 ff0797688e..ff0797688e 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 c6338ea17b..c6338ea17b 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 eee324bb60..8f8c04afe5 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 e364879e72..e364879e72 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 81907f6776..81907f6776 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 eee324bb60..8f8c04afe5 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 61c6127690..61c6127690 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 929d3f00db..929d3f00db 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 eee324bb60..8f8c04afe5 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 5106037589..5106037589 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 e35e99bf80..e35e99bf80 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 eee324bb60..8f8c04afe5 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 0d060c2699..0d060c2699 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 daf50a668e..daf50a668e 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 eee324bb60..8f8c04afe5 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 cf90e8b74f..cf90e8b74f 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 30fe436180..30fe436180 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 eee324bb60..8f8c04afe5 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 faa65c7f2b..faa65c7f2b 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 8f5bf5189e..8f5bf5189e 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 eee324bb60..8f8c04afe5 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 25c06c3bbc..25c06c3bbc 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 5265c3ec30..5265c3ec30 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 eee324bb60..8f8c04afe5 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 81e3230ffe..81e3230ffe 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 1746645e0c..1746645e0c 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 eee324bb60..8f8c04afe5 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 c681f29c5b..c681f29c5b 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 84821c3369..84821c3369 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 eee324bb60..8f8c04afe5 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 6f12b2aa5e..6f12b2aa5e 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 571e21b861..571e21b861 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 eee324bb60..8f8c04afe5 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 f4437a0a2b..f4437a0a2b 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 e5d2e1e281..e5d2e1e281 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 eee324bb60..8f8c04afe5 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 78de390e21..78de390e21 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 b746771536..b746771536 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 eee324bb60..8f8c04afe5 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 15635507ff..15635507ff 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 95ea6cc73c..95ea6cc73c 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 eee324bb60..8f8c04afe5 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 806700a552..806700a552 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 50f48acb17..50f48acb17 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 eee324bb60..8f8c04afe5 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 ed89c6d02d..ed89c6d02d 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 e96ca3e0ec..e96ca3e0ec 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 eee324bb60..8f8c04afe5 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 d5cda8e6c0..d5cda8e6c0 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 1d4a1bd34e..1d4a1bd34e 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 eee324bb60..8f8c04afe5 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 2b5efc5d4d..2b5efc5d4d 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 57dce33310..57dce33310 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 eee324bb60..8f8c04afe5 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 e9334e323e..e9334e323e 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 ddf918de7f..ddf918de7f 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 eee324bb60..8f8c04afe5 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 a5c4253641..a5c4253641 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 b634e26c5f..b634e26c5f 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 eee324bb60..8f8c04afe5 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 c2ad57e3a0..c2ad57e3a0 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 0c4f0dc6c0..0c4f0dc6c0 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 eee324bb60..8f8c04afe5 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 ad79d9654f..ad79d9654f 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 a2020a68e4..a2020a68e4 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 eee324bb60..8f8c04afe5 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 f40a29467d..f40a29467d 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 780e571ddc..780e571ddc 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 eee324bb60..8f8c04afe5 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 1d843305d9..1d843305d9 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 40c26cadfb..40c26cadfb 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 eee324bb60..8f8c04afe5 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 30fdfbef10..30fdfbef10 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 7325ab2c74..7325ab2c74 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 eee324bb60..8f8c04afe5 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 92907b63dc..92907b63dc 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 9ed005067b..9ed005067b 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 eee324bb60..8f8c04afe5 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 7f0c283498..7f0c283498 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 bc2b88bf40..bc2b88bf40 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 eee324bb60..8f8c04afe5 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 77a9e8a268..77a9e8a268 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 cfafefd2b1..cfafefd2b1 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 eee324bb60..8f8c04afe5 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 68ae5dcaaf..68ae5dcaaf 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 0aa2b79122..0aa2b79122 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 eee324bb60..8f8c04afe5 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 31253becd7..31253becd7 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 4e3045fc6a..4e3045fc6a 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 eee324bb60..8f8c04afe5 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 a550e54f00..a550e54f00 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 3557a63ea8..3557a63ea8 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 eee324bb60..8f8c04afe5 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()