14 files changed, 24 insertions, 90 deletions

diff --git a/library/cpp/sanitizer/address/dynamic/ya.make b/library/cpp/sanitizer/address/dynamic/ya.make
index 4aeba7f2b5..c892849414 100644
--- a/library/cpp/sanitizer/address/dynamic/ya.make
+++ b/library/cpp/sanitizer/address/dynamic/ya.make
@@ -6,17 +6,10 @@ NO_UTIL()
 
 EXPORT_ALL_DYNAMIC_SYMBOLS()
 
-IF (CLANG16)
 DYNAMIC_LIBRARY_FROM(
-    contrib/libs/clang16-rt/lib/asan
-    contrib/libs/clang16-rt/lib/asan_cxx
+    contrib/libs/clang${CLANG_VER}-rt/lib/asan
+    contrib/libs/clang${CLANG_VER}-rt/lib/asan_cxx
 )
-ELSE()
-DYNAMIC_LIBRARY_FROM(
-    contrib/libs/clang14-rt/lib/asan
-    contrib/libs/clang14-rt/lib/asan_cxx
-)
-ENDIF()
 
 END()
 
diff --git a/library/cpp/sanitizer/address/static/ya.make b/library/cpp/sanitizer/address/static/ya.make
index eb9843bc6e..ddbd90f2f9 100644
--- a/library/cpp/sanitizer/address/static/ya.make
+++ b/library/cpp/sanitizer/address/static/ya.make
@@ -4,19 +4,11 @@ OWNER(g:devtools-contrib)
 
 NO_UTIL()
 
-IF (CLANG16)
 PEERDIR(
-    contrib/libs/clang16-rt/lib/asan
-    contrib/libs/clang16-rt/lib/asan_cxx
-    contrib/libs/clang16-rt/lib/asan_static
+    contrib/libs/clang${CLANG_VER}-rt/lib/asan
+    contrib/libs/clang${CLANG_VER}-rt/lib/asan_cxx
+    contrib/libs/clang${CLANG_VER}-rt/lib/asan_static
 )
-ELSE()
-PEERDIR(
-    contrib/libs/clang14-rt/lib/asan
-    contrib/libs/clang14-rt/lib/asan_cxx
-    contrib/libs/clang14-rt/lib/asan_static
-)
-ENDIF()
 
 END()
 
diff --git a/library/cpp/sanitizer/include/CMakeLists.darwin-arm64.txt b/library/cpp/sanitizer/include/CMakeLists.darwin-arm64.txt
index c6705a4cac..a2871edfc2 100644
--- a/library/cpp/sanitizer/include/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/sanitizer/include/CMakeLists.darwin-arm64.txt
@@ -9,5 +9,5 @@
 
 add_library(cpp-sanitizer-include INTERFACE)
 target_include_directories(cpp-sanitizer-include INTERFACE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/clang14-rt/include
+  ${CMAKE_SOURCE_DIR}/contrib/libs/clang16-rt/include
 )
diff --git a/library/cpp/sanitizer/include/CMakeLists.darwin-x86_64.txt b/library/cpp/sanitizer/include/CMakeLists.darwin-x86_64.txt
index c6705a4cac..a2871edfc2 100644
--- a/library/cpp/sanitizer/include/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/sanitizer/include/CMakeLists.darwin-x86_64.txt
@@ -9,5 +9,5 @@
 
 add_library(cpp-sanitizer-include INTERFACE)
 target_include_directories(cpp-sanitizer-include INTERFACE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/clang14-rt/include
+  ${CMAKE_SOURCE_DIR}/contrib/libs/clang16-rt/include
 )
diff --git a/library/cpp/sanitizer/include/CMakeLists.linux-aarch64.txt b/library/cpp/sanitizer/include/CMakeLists.linux-aarch64.txt
index ade2eca0b4..fa46dce697 100644
--- a/library/cpp/sanitizer/include/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/sanitizer/include/CMakeLists.linux-aarch64.txt
@@ -9,7 +9,7 @@
 
 add_library(cpp-sanitizer-include INTERFACE)
 target_include_directories(cpp-sanitizer-include INTERFACE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/clang14-rt/include
+  ${CMAKE_SOURCE_DIR}/contrib/libs/clang16-rt/include
 )
 target_link_libraries(cpp-sanitizer-include INTERFACE
   contrib-libs-linux-headers
diff --git a/library/cpp/sanitizer/include/CMakeLists.linux-x86_64.txt b/library/cpp/sanitizer/include/CMakeLists.linux-x86_64.txt
index ade2eca0b4..fa46dce697 100644
--- a/library/cpp/sanitizer/include/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/sanitizer/include/CMakeLists.linux-x86_64.txt
@@ -9,7 +9,7 @@
 
 add_library(cpp-sanitizer-include INTERFACE)
 target_include_directories(cpp-sanitizer-include INTERFACE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/clang14-rt/include
+  ${CMAKE_SOURCE_DIR}/contrib/libs/clang16-rt/include
 )
 target_link_libraries(cpp-sanitizer-include INTERFACE
   contrib-libs-linux-headers
diff --git a/library/cpp/sanitizer/include/ya.make b/library/cpp/sanitizer/include/ya.make
index 7bc70e531d..444a570333 100644
--- a/library/cpp/sanitizer/include/ya.make
+++ b/library/cpp/sanitizer/include/ya.make
@@ -4,11 +4,7 @@ NO_SANITIZE()
 
 NO_RUNTIME()
 
-IF (CLANG16)
-ADDINCL(GLOBAL contrib/libs/clang16-rt/include)
-ELSE()
-ADDINCL(GLOBAL contrib/libs/clang14-rt/include)
-ENDIF()
+ADDINCL(GLOBAL contrib/libs/clang${CLANG_VER}-rt/include)
 
 END()
 
diff --git a/library/cpp/sanitizer/leak/dynamic/ya.make b/library/cpp/sanitizer/leak/dynamic/ya.make
index 8e2ce1d484..79dcd4ad37 100644
--- a/library/cpp/sanitizer/leak/dynamic/ya.make
+++ b/library/cpp/sanitizer/leak/dynamic/ya.make
@@ -6,15 +6,9 @@ NO_UTIL()
 
 EXPORT_ALL_DYNAMIC_SYMBOLS()
 
-IF (CLANG16)
 DYNAMIC_LIBRARY_FROM(
-    contrib/libs/clang16-rt/lib/lsan
+    contrib/libs/clang${CLANG_VER}-rt/lib/lsan
 )
-ELSE()
-DYNAMIC_LIBRARY_FROM(
-    contrib/libs/clang14-rt/lib/lsan
-)
-ENDIF()
 
 END()
 
diff --git a/library/cpp/sanitizer/leak/static/ya.make b/library/cpp/sanitizer/leak/static/ya.make
index 9272d9a4ce..0d5a8fdfd7 100644
--- a/library/cpp/sanitizer/leak/static/ya.make
+++ b/library/cpp/sanitizer/leak/static/ya.make
@@ -4,15 +4,9 @@ OWNER(g:devtools-contrib)
 
 NO_UTIL()
 
-IF (CLANG16)
 PEERDIR(
-    contrib/libs/clang16-rt/lib/lsan
+    contrib/libs/clang${CLANG_VER}-rt/lib/lsan
 )
-ELSE()
-PEERDIR(
-    contrib/libs/clang14-rt/lib/lsan
-)
-ENDIF()
 
 END()
 
diff --git a/library/cpp/sanitizer/memory/static/ya.make b/library/cpp/sanitizer/memory/static/ya.make
index e92ac3124e..e6bb9c8c75 100644
--- a/library/cpp/sanitizer/memory/static/ya.make
+++ b/library/cpp/sanitizer/memory/static/ya.make
@@ -4,17 +4,10 @@ OWNER(g:devtools-contrib)
 
 NO_UTIL()
 
-IF (CLANG16)
 PEERDIR(
-    contrib/libs/clang16-rt/lib/msan
-    contrib/libs/clang16-rt/lib/msan_cxx
+    contrib/libs/clang${CLANG_VER}-rt/lib/msan
+    contrib/libs/clang${CLANG_VER}-rt/lib/msan_cxx
 )
-ELSE()
-PEERDIR(
-    contrib/libs/clang14-rt/lib/msan
-    contrib/libs/clang14-rt/lib/msan_cxx
-)
-ENDIF()
 
 END()
 
diff --git a/library/cpp/sanitizer/thread/dynamic/ya.make b/library/cpp/sanitizer/thread/dynamic/ya.make
index b73caed25f..4d15cb066e 100644
--- a/library/cpp/sanitizer/thread/dynamic/ya.make
+++ b/library/cpp/sanitizer/thread/dynamic/ya.make
@@ -6,17 +6,10 @@ NO_UTIL()
 
 EXPORT_ALL_DYNAMIC_SYMBOLS()
 
-IF (CLANG16)
 DYNAMIC_LIBRARY_FROM(
-    contrib/libs/clang14-rt/lib/tsan
-    contrib/libs/clang14-rt/lib/tsan_cxx
+    contrib/libs/clang${CLANG_VER}-rt/lib/tsan
+    contrib/libs/clang${CLANG_VER}-rt/lib/tsan_cxx
 )
-ELSE()
-DYNAMIC_LIBRARY_FROM(
-    contrib/libs/clang14-rt/lib/tsan
-    contrib/libs/clang14-rt/lib/tsan_cxx
-)
-ENDIF()
 
 END()
 
diff --git a/library/cpp/sanitizer/thread/static/ya.make b/library/cpp/sanitizer/thread/static/ya.make
index a4b04d7758..f5bc931a51 100644
--- a/library/cpp/sanitizer/thread/static/ya.make
+++ b/library/cpp/sanitizer/thread/static/ya.make
@@ -4,17 +4,10 @@ OWNER(g:devtools-contrib)
 
 NO_UTIL()
 
-IF (CLANG16)
 PEERDIR(
-    contrib/libs/clang16-rt/lib/tsan
-    contrib/libs/clang16-rt/lib/tsan_cxx
+    contrib/libs/clang${CLANG_VER}-rt/lib/tsan
+    contrib/libs/clang${CLANG_VER}-rt/lib/tsan_cxx
 )
-ELSE()
-PEERDIR(
-    contrib/libs/clang14-rt/lib/tsan
-    contrib/libs/clang14-rt/lib/tsan_cxx
-)
-ENDIF()
 
 END()
 
diff --git a/library/cpp/sanitizer/undefined/dynamic/ya.make b/library/cpp/sanitizer/undefined/dynamic/ya.make
index b7f2ee9a20..330018d006 100644
--- a/library/cpp/sanitizer/undefined/dynamic/ya.make
+++ b/library/cpp/sanitizer/undefined/dynamic/ya.make
@@ -6,17 +6,10 @@ NO_UTIL()
 
 EXPORT_ALL_DYNAMIC_SYMBOLS()
 
-IF (CLANG16)
 DYNAMIC_LIBRARY_FROM(
-    contrib/libs/clang16-rt/lib/ubsan_standalone
-    contrib/libs/clang16-rt/lib/ubsan_standalone_cxx
+    contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone
+    contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone_cxx
 )
-ELSE()
-DYNAMIC_LIBRARY_FROM(
-    contrib/libs/clang14-rt/lib/ubsan_standalone
-    contrib/libs/clang14-rt/lib/ubsan_standalone_cxx
-)
-ENDIF()
 
 END()
 
diff --git a/library/cpp/sanitizer/undefined/static/ya.make b/library/cpp/sanitizer/undefined/static/ya.make
index 777db2f897..bab3149e74 100644
--- a/library/cpp/sanitizer/undefined/static/ya.make
+++ b/library/cpp/sanitizer/undefined/static/ya.make
@@ -4,17 +4,10 @@ OWNER(g:devtools-contrib)
 
 NO_UTIL()
 
-IF (CLANG16)
-    PEERDIR(
-        contrib/libs/clang16-rt/lib/ubsan_standalone
-        contrib/libs/clang16-rt/lib/ubsan_standalone_cxx
-    )
-ELSE()
-    PEERDIR(
-        contrib/libs/clang14-rt/lib/ubsan_standalone
-        contrib/libs/clang14-rt/lib/ubsan_standalone_cxx
-    )
-ENDIF()
+PEERDIR(
+    contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone
+    contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone_cxx
+)
 
 END()