diff options
| author | reshilkin <reshilkin@yandex-team.com> | 2023-07-26 19:41:21 +0300 |
|---|---|---|
| committer | reshilkin <reshilkin@yandex-team.com> | 2023-07-26 19:41:21 +0300 |
| commit | d59a5a6d332e8ce09508399e7ae7016bf0efb0e8 (patch) | |
| tree | 4361b4df125ce2f6734c79ef7f858432a8f0e7e7 | |
| parent | c1a0a6dc9351bcf42a4388db5f643525eda156bc (diff) | |
| download | ydb-d59a5a6d332e8ce09508399e7ae7016bf0efb0e8.tar.gz | |
Add explicit sanitizer dependencies missed before contrib/tools
| -rw-r--r-- | CMakeLists.darwin-x86_64.txt | 2 | ||||
| -rw-r--r-- | CMakeLists.linux-aarch64.txt | 2 | ||||
| -rw-r--r-- | CMakeLists.linux-x86_64.txt | 2 | ||||
| -rw-r--r-- | contrib/libs/libunwind/CMakeLists.darwin-x86_64.txt | 3 | ||||
| -rw-r--r-- | contrib/libs/libunwind/CMakeLists.linux-aarch64.txt | 1 | ||||
| -rw-r--r-- | contrib/libs/libunwind/CMakeLists.linux-x86_64.txt | 1 | ||||
| -rw-r--r-- | contrib/libs/libunwind/ya.make | 4 | ||||
| -rw-r--r-- | contrib/libs/openssl/apps/ya.make | 1 | ||||
| -rw-r--r-- | contrib/libs/openssl/crypto/ya.make | 1 |
9 files changed, 14 insertions, 3 deletions
diff --git a/CMakeLists.darwin-x86_64.txt b/CMakeLists.darwin-x86_64.txt index fa276972cd1..73f5b171fca 100644 --- a/CMakeLists.darwin-x86_64.txt +++ b/CMakeLists.darwin-x86_64.txt @@ -8,7 +8,7 @@ add_subdirectory(tools) add_subdirectory(contrib) -add_subdirectory(util) add_subdirectory(library) +add_subdirectory(util) add_subdirectory(ydb) add_subdirectory(certs) diff --git a/CMakeLists.linux-aarch64.txt b/CMakeLists.linux-aarch64.txt index fa276972cd1..73f5b171fca 100644 --- a/CMakeLists.linux-aarch64.txt +++ b/CMakeLists.linux-aarch64.txt @@ -8,7 +8,7 @@ add_subdirectory(tools) add_subdirectory(contrib) -add_subdirectory(util) add_subdirectory(library) +add_subdirectory(util) add_subdirectory(ydb) add_subdirectory(certs) diff --git a/CMakeLists.linux-x86_64.txt b/CMakeLists.linux-x86_64.txt index fa276972cd1..73f5b171fca 100644 --- a/CMakeLists.linux-x86_64.txt +++ b/CMakeLists.linux-x86_64.txt @@ -8,7 +8,7 @@ add_subdirectory(tools) add_subdirectory(contrib) -add_subdirectory(util) add_subdirectory(library) +add_subdirectory(util) add_subdirectory(ydb) add_subdirectory(certs) diff --git a/contrib/libs/libunwind/CMakeLists.darwin-x86_64.txt b/contrib/libs/libunwind/CMakeLists.darwin-x86_64.txt index 47aedfab8fa..d605a4adb78 100644 --- a/contrib/libs/libunwind/CMakeLists.darwin-x86_64.txt +++ b/contrib/libs/libunwind/CMakeLists.darwin-x86_64.txt @@ -20,6 +20,9 @@ target_compile_options(contrib-libs-libunwind PRIVATE target_include_directories(contrib-libs-libunwind PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/libunwind/include ) +target_link_libraries(contrib-libs-libunwind PUBLIC + cpp-sanitizer-include +) target_sources(contrib-libs-libunwind PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/libunwind/src/Unwind-EHABI.cpp ${CMAKE_SOURCE_DIR}/contrib/libs/libunwind/src/Unwind-seh.cpp diff --git a/contrib/libs/libunwind/CMakeLists.linux-aarch64.txt b/contrib/libs/libunwind/CMakeLists.linux-aarch64.txt index 80a28161e0b..2043d7aec70 100644 --- a/contrib/libs/libunwind/CMakeLists.linux-aarch64.txt +++ b/contrib/libs/libunwind/CMakeLists.linux-aarch64.txt @@ -22,6 +22,7 @@ target_include_directories(contrib-libs-libunwind PRIVATE ) target_link_libraries(contrib-libs-libunwind PUBLIC contrib-libs-linux-headers + cpp-sanitizer-include ) target_sources(contrib-libs-libunwind PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/libunwind/src/Unwind-EHABI.cpp diff --git a/contrib/libs/libunwind/CMakeLists.linux-x86_64.txt b/contrib/libs/libunwind/CMakeLists.linux-x86_64.txt index 80a28161e0b..2043d7aec70 100644 --- a/contrib/libs/libunwind/CMakeLists.linux-x86_64.txt +++ b/contrib/libs/libunwind/CMakeLists.linux-x86_64.txt @@ -22,6 +22,7 @@ target_include_directories(contrib-libs-libunwind PRIVATE ) target_link_libraries(contrib-libs-libunwind PUBLIC contrib-libs-linux-headers + cpp-sanitizer-include ) target_sources(contrib-libs-libunwind PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/libunwind/src/Unwind-EHABI.cpp diff --git a/contrib/libs/libunwind/ya.make b/contrib/libs/libunwind/ya.make index 1af0243b611..ff465ee5cb4 100644 --- a/contrib/libs/libunwind/ya.make +++ b/contrib/libs/libunwind/ya.make @@ -17,6 +17,10 @@ ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-14.0.6.tar. DISABLE(USE_LTO) +PEERDIR( + library/cpp/sanitizer/include +) + ADDINCL( contrib/libs/libunwind/include ) diff --git a/contrib/libs/openssl/apps/ya.make b/contrib/libs/openssl/apps/ya.make index 5b30a9f7351..179b281885d 100644 --- a/contrib/libs/openssl/apps/ya.make +++ b/contrib/libs/openssl/apps/ya.make @@ -10,6 +10,7 @@ LICENSE_TEXTS(.yandex_meta/licenses.list.txt) PEERDIR( contrib/libs/openssl contrib/libs/openssl/crypto + library/cpp/sanitizer/include ) ADDINCL( diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make index 721348592bc..b927626bded 100644 --- a/contrib/libs/openssl/crypto/ya.make +++ b/contrib/libs/openssl/crypto/ya.make @@ -22,6 +22,7 @@ OPENSOURCE_EXPORT_REPLACEMENT( PEERDIR( contrib/libs/zlib + library/cpp/sanitizer/include ) ADDINCL( |