summaryrefslogtreecommitdiffstats
path: root/library/cpp
diff options
context:
space:
mode:
authorhiddenpath <[email protected]>2023-12-04 12:08:11 +0300
committerhiddenpath <[email protected]>2023-12-04 15:43:25 +0300
commit0311ea8d1618ae1f7384ef3342432fa33aa0df0c (patch)
treee6f15e957fcefb8ad093c69346dbbba417242cd4 /library/cpp
parentf37c4c9349e2c8c433d52d4be744cf5dc9aa7909 (diff)
Fix clashing macro
Diffstat (limited to 'library/cpp')
-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
14 files changed, 22 insertions, 22 deletions
diff --git a/library/cpp/sanitizer/address/dynamic/ya.make b/library/cpp/sanitizer/address/dynamic/ya.make
index c8928494147..9c7ebbb95cf 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${CLANG_VER}-rt/lib/asan
- contrib/libs/clang${CLANG_VER}-rt/lib/asan_cxx
+ contrib/libs/clang${YA_CLANG_VER}-rt/lib/asan
+ contrib/libs/clang${YA_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 ddbd90f2f98..6d602b29beb 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${CLANG_VER}-rt/lib/asan
- contrib/libs/clang${CLANG_VER}-rt/lib/asan_cxx
- contrib/libs/clang${CLANG_VER}-rt/lib/asan_static
+ 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
)
END()
diff --git a/library/cpp/sanitizer/include/CMakeLists.darwin-arm64.txt b/library/cpp/sanitizer/include/CMakeLists.darwin-arm64.txt
index a2871edfc28..c6705a4cac0 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/clang16-rt/include
+ ${CMAKE_SOURCE_DIR}/contrib/libs/clang14-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 a2871edfc28..c6705a4cac0 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/clang16-rt/include
+ ${CMAKE_SOURCE_DIR}/contrib/libs/clang14-rt/include
)
diff --git a/library/cpp/sanitizer/include/CMakeLists.linux-aarch64.txt b/library/cpp/sanitizer/include/CMakeLists.linux-aarch64.txt
index fa46dce697c..ade2eca0b4c 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/clang16-rt/include
+ ${CMAKE_SOURCE_DIR}/contrib/libs/clang14-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 fa46dce697c..ade2eca0b4c 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/clang16-rt/include
+ ${CMAKE_SOURCE_DIR}/contrib/libs/clang14-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 444a5703335..e61c236e4fb 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${CLANG_VER}-rt/include)
+ADDINCL(GLOBAL contrib/libs/clang${YA_CLANG_VER}-rt/include)
END()
diff --git a/library/cpp/sanitizer/leak/dynamic/ya.make b/library/cpp/sanitizer/leak/dynamic/ya.make
index 79dcd4ad376..53f587bde43 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${CLANG_VER}-rt/lib/lsan
+ contrib/libs/clang${YA_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 0d5a8fdfd76..d33c7c24060 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${CLANG_VER}-rt/lib/lsan
+ contrib/libs/clang${YA_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 e6bb9c8c756..dd7f1171578 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${CLANG_VER}-rt/lib/msan
- contrib/libs/clang${CLANG_VER}-rt/lib/msan_cxx
+ contrib/libs/clang${YA_CLANG_VER}-rt/lib/msan
+ contrib/libs/clang${YA_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 4d15cb066e5..42cc2297c06 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${CLANG_VER}-rt/lib/tsan
- contrib/libs/clang${CLANG_VER}-rt/lib/tsan_cxx
+ contrib/libs/clang${YA_CLANG_VER}-rt/lib/tsan
+ contrib/libs/clang${YA_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 f5bc931a51c..0df1b87ba30 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${CLANG_VER}-rt/lib/tsan
- contrib/libs/clang${CLANG_VER}-rt/lib/tsan_cxx
+ contrib/libs/clang${YA_CLANG_VER}-rt/lib/tsan
+ contrib/libs/clang${YA_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 330018d006e..028c16c7741 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${CLANG_VER}-rt/lib/ubsan_standalone
- contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone_cxx
+ contrib/libs/clang${YA_CLANG_VER}-rt/lib/ubsan_standalone
+ contrib/libs/clang${YA_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 bab3149e740..9d2bd9e2816 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${CLANG_VER}-rt/lib/ubsan_standalone
- contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone_cxx
+ contrib/libs/clang${YA_CLANG_VER}-rt/lib/ubsan_standalone
+ contrib/libs/clang${YA_CLANG_VER}-rt/lib/ubsan_standalone_cxx
)
END()