summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/conf/settings.conf4
-rw-r--r--build/platform/lld/lld14.json17
-rw-r--r--library/cpp/sanitizer/address/dynamic/ya.make4
-rw-r--r--library/cpp/sanitizer/address/static/ya.make6
-rw-r--r--library/cpp/sanitizer/include/CMakeLists.darwin-arm64.txt2
-rw-r--r--library/cpp/sanitizer/include/CMakeLists.darwin-x86_64.txt2
-rw-r--r--library/cpp/sanitizer/include/CMakeLists.linux-aarch64.txt2
-rw-r--r--library/cpp/sanitizer/include/CMakeLists.linux-x86_64.txt2
-rw-r--r--library/cpp/sanitizer/include/ya.make2
-rw-r--r--library/cpp/sanitizer/leak/dynamic/ya.make2
-rw-r--r--library/cpp/sanitizer/leak/static/ya.make2
-rw-r--r--library/cpp/sanitizer/memory/static/ya.make4
-rw-r--r--library/cpp/sanitizer/thread/dynamic/ya.make4
-rw-r--r--library/cpp/sanitizer/thread/static/ya.make4
-rw-r--r--library/cpp/sanitizer/undefined/dynamic/ya.make4
-rw-r--r--library/cpp/sanitizer/undefined/static/ya.make4
16 files changed, 41 insertions, 24 deletions
diff --git a/build/conf/settings.conf b/build/conf/settings.conf
index d32954ac40c..51383aea38b 100644
--- a/build/conf/settings.conf
+++ b/build/conf/settings.conf
@@ -108,8 +108,8 @@ _FOLDABLE_VARS=\
# end of _FOLDABLE_VARS list
-YA_CLANG_VER=14
+CLANG_VER=14
when ($CLANG16 == "yes") {
- YA_CLANG_VER=16
+ CLANG_VER=16
}
diff --git a/build/platform/lld/lld14.json b/build/platform/lld/lld14.json
new file mode 100644
index 00000000000..63c38f0a143
--- /dev/null
+++ b/build/platform/lld/lld14.json
@@ -0,0 +1,17 @@
+{
+ "by_platform": {
+ "darwin-arm64": {
+ "uri": "sbr:4588370003"
+ },
+ "darwin-x86_64": {
+ "uri": "sbr:4588378868"
+ },
+ "linux-aarch64": {
+ "uri": "sbr:4588389789"
+ },
+ "linux-x86_64": {
+ "uri": "sbr:4588396480"
+ }
+ }
+}
+
diff --git a/library/cpp/sanitizer/address/dynamic/ya.make b/library/cpp/sanitizer/address/dynamic/ya.make
index 9c7ebbb95cf..c8928494147 100644
--- a/library/cpp/sanitizer/address/dynamic/ya.make
+++ b/library/cpp/sanitizer/address/dynamic/ya.make
@@ -7,8 +7,8 @@ NO_UTIL()
EXPORT_ALL_DYNAMIC_SYMBOLS()
DYNAMIC_LIBRARY_FROM(
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/asan
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/asan_cxx
+ contrib/libs/clang${CLANG_VER}-rt/lib/asan
+ contrib/libs/clang${CLANG_VER}-rt/lib/asan_cxx
)
END()
diff --git a/library/cpp/sanitizer/address/static/ya.make b/library/cpp/sanitizer/address/static/ya.make
index 6d602b29beb..ddbd90f2f98 100644
--- a/library/cpp/sanitizer/address/static/ya.make
+++ b/library/cpp/sanitizer/address/static/ya.make
@@ -5,9 +5,9 @@ OWNER(g:devtools-contrib)
NO_UTIL()
PEERDIR(
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/asan
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/asan_cxx
- contrib/libs/clang${YA_CLANG_VER}-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
)
END()
diff --git a/library/cpp/sanitizer/include/CMakeLists.darwin-arm64.txt b/library/cpp/sanitizer/include/CMakeLists.darwin-arm64.txt
index c6705a4cac0..a2871edfc28 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 c6705a4cac0..a2871edfc28 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 ade2eca0b4c..fa46dce697c 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 ade2eca0b4c..fa46dce697c 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 e61c236e4fb..444a5703335 100644
--- a/library/cpp/sanitizer/include/ya.make
+++ b/library/cpp/sanitizer/include/ya.make
@@ -4,7 +4,7 @@ NO_SANITIZE()
NO_RUNTIME()
-ADDINCL(GLOBAL contrib/libs/clang${YA_CLANG_VER}-rt/include)
+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 53f587bde43..79dcd4ad376 100644
--- a/library/cpp/sanitizer/leak/dynamic/ya.make
+++ b/library/cpp/sanitizer/leak/dynamic/ya.make
@@ -7,7 +7,7 @@ NO_UTIL()
EXPORT_ALL_DYNAMIC_SYMBOLS()
DYNAMIC_LIBRARY_FROM(
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/lsan
+ contrib/libs/clang${CLANG_VER}-rt/lib/lsan
)
END()
diff --git a/library/cpp/sanitizer/leak/static/ya.make b/library/cpp/sanitizer/leak/static/ya.make
index d33c7c24060..0d5a8fdfd76 100644
--- a/library/cpp/sanitizer/leak/static/ya.make
+++ b/library/cpp/sanitizer/leak/static/ya.make
@@ -5,7 +5,7 @@ OWNER(g:devtools-contrib)
NO_UTIL()
PEERDIR(
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/lsan
+ contrib/libs/clang${CLANG_VER}-rt/lib/lsan
)
END()
diff --git a/library/cpp/sanitizer/memory/static/ya.make b/library/cpp/sanitizer/memory/static/ya.make
index dd7f1171578..e6bb9c8c756 100644
--- a/library/cpp/sanitizer/memory/static/ya.make
+++ b/library/cpp/sanitizer/memory/static/ya.make
@@ -5,8 +5,8 @@ OWNER(g:devtools-contrib)
NO_UTIL()
PEERDIR(
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/msan
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/msan_cxx
+ contrib/libs/clang${CLANG_VER}-rt/lib/msan
+ contrib/libs/clang${CLANG_VER}-rt/lib/msan_cxx
)
END()
diff --git a/library/cpp/sanitizer/thread/dynamic/ya.make b/library/cpp/sanitizer/thread/dynamic/ya.make
index 42cc2297c06..4d15cb066e5 100644
--- a/library/cpp/sanitizer/thread/dynamic/ya.make
+++ b/library/cpp/sanitizer/thread/dynamic/ya.make
@@ -7,8 +7,8 @@ NO_UTIL()
EXPORT_ALL_DYNAMIC_SYMBOLS()
DYNAMIC_LIBRARY_FROM(
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/tsan
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/tsan_cxx
+ contrib/libs/clang${CLANG_VER}-rt/lib/tsan
+ contrib/libs/clang${CLANG_VER}-rt/lib/tsan_cxx
)
END()
diff --git a/library/cpp/sanitizer/thread/static/ya.make b/library/cpp/sanitizer/thread/static/ya.make
index 0df1b87ba30..f5bc931a51c 100644
--- a/library/cpp/sanitizer/thread/static/ya.make
+++ b/library/cpp/sanitizer/thread/static/ya.make
@@ -5,8 +5,8 @@ OWNER(g:devtools-contrib)
NO_UTIL()
PEERDIR(
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/tsan
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/tsan_cxx
+ contrib/libs/clang${CLANG_VER}-rt/lib/tsan
+ contrib/libs/clang${CLANG_VER}-rt/lib/tsan_cxx
)
END()
diff --git a/library/cpp/sanitizer/undefined/dynamic/ya.make b/library/cpp/sanitizer/undefined/dynamic/ya.make
index 028c16c7741..330018d006e 100644
--- a/library/cpp/sanitizer/undefined/dynamic/ya.make
+++ b/library/cpp/sanitizer/undefined/dynamic/ya.make
@@ -7,8 +7,8 @@ NO_UTIL()
EXPORT_ALL_DYNAMIC_SYMBOLS()
DYNAMIC_LIBRARY_FROM(
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/ubsan_standalone
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/ubsan_standalone_cxx
+ contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone
+ contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone_cxx
)
END()
diff --git a/library/cpp/sanitizer/undefined/static/ya.make b/library/cpp/sanitizer/undefined/static/ya.make
index 9d2bd9e2816..bab3149e740 100644
--- a/library/cpp/sanitizer/undefined/static/ya.make
+++ b/library/cpp/sanitizer/undefined/static/ya.make
@@ -5,8 +5,8 @@ OWNER(g:devtools-contrib)
NO_UTIL()
PEERDIR(
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/ubsan_standalone
- contrib/libs/clang${YA_CLANG_VER}-rt/lib/ubsan_standalone_cxx
+ contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone
+ contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone_cxx
)
END()