diff options
author | dcherednik <dcherednik@ydb.tech> | 2023-08-07 17:11:59 +0300 |
---|---|---|
committer | dcherednik <dcherednik@ydb.tech> | 2023-08-07 20:14:23 +0300 |
commit | e86838db93808fd09203595e534dbad513bcc53c (patch) | |
tree | 0aecab2af05d64603b96ac36ea188e1fc9715e7b | |
parent | 2b2d744d48095226984ba69a058f8531a3d095a7 (diff) | |
download | ydb-e86838db93808fd09203595e534dbad513bcc53c.tar.gz |
Fix missed peerdir for non x86 build. KIKIMR-18966
8 files changed, 71 insertions, 1 deletions
diff --git a/ydb/library/yql/utils/backtrace/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/utils/backtrace/CMakeLists.darwin-x86_64.txt index 38e844a4a0..eec03a6e78 100644 --- a/ydb/library/yql/utils/backtrace/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/utils/backtrace/CMakeLists.darwin-x86_64.txt @@ -6,12 +6,14 @@ # original buildsystem will not be accepted. +add_subdirectory(fake_llvm_symbolizer) add_subdirectory(ut) add_library(yql-utils-backtrace) target_link_libraries(yql-utils-backtrace PUBLIC contrib-libs-cxxsupp yutil + utils-backtrace-fake_llvm_symbolizer lib-DebugInfo-Symbolize cpp-deprecated-atomic ) diff --git a/ydb/library/yql/utils/backtrace/CMakeLists.linux-aarch64.txt b/ydb/library/yql/utils/backtrace/CMakeLists.linux-aarch64.txt index 60ff40d7a0..2ac25c993a 100644 --- a/ydb/library/yql/utils/backtrace/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/utils/backtrace/CMakeLists.linux-aarch64.txt @@ -6,6 +6,7 @@ # original buildsystem will not be accepted. +add_subdirectory(fake_llvm_symbolizer) add_subdirectory(ut) add_library(yql-utils-backtrace) @@ -13,6 +14,7 @@ target_link_libraries(yql-utils-backtrace PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp yutil + utils-backtrace-fake_llvm_symbolizer lib-DebugInfo-Symbolize cpp-deprecated-atomic ) diff --git a/ydb/library/yql/utils/backtrace/CMakeLists.windows-x86_64.txt b/ydb/library/yql/utils/backtrace/CMakeLists.windows-x86_64.txt index 38e844a4a0..eec03a6e78 100644 --- a/ydb/library/yql/utils/backtrace/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/utils/backtrace/CMakeLists.windows-x86_64.txt @@ -6,12 +6,14 @@ # original buildsystem will not be accepted. +add_subdirectory(fake_llvm_symbolizer) add_subdirectory(ut) add_library(yql-utils-backtrace) target_link_libraries(yql-utils-backtrace PUBLIC contrib-libs-cxxsupp yutil + utils-backtrace-fake_llvm_symbolizer lib-DebugInfo-Symbolize cpp-deprecated-atomic ) diff --git a/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.darwin-x86_64.txt new file mode 100644 index 0000000000..17698b5a8f --- /dev/null +++ b/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.darwin-x86_64.txt @@ -0,0 +1,18 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_library(utils-backtrace-fake_llvm_symbolizer) +target_link_libraries(utils-backtrace-fake_llvm_symbolizer PUBLIC + contrib-libs-cxxsupp + yutil + lib-DebugInfo-Symbolize +) +target_sources(utils-backtrace-fake_llvm_symbolizer PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/fake_llvm_symbolizer.cpp +) diff --git a/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.linux-aarch64.txt b/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.linux-aarch64.txt new file mode 100644 index 0000000000..940fe1c6be --- /dev/null +++ b/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.linux-aarch64.txt @@ -0,0 +1,19 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_library(utils-backtrace-fake_llvm_symbolizer) +target_link_libraries(utils-backtrace-fake_llvm_symbolizer PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp + yutil + lib-DebugInfo-Symbolize +) +target_sources(utils-backtrace-fake_llvm_symbolizer PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/fake_llvm_symbolizer.cpp +) diff --git a/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.txt b/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.txt index 67bf46faf4..f8b31df0c1 100644 --- a/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.txt +++ b/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.txt @@ -6,6 +6,12 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-aarch64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + include(CMakeLists.darwin-x86_64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) + include(CMakeLists.windows-x86_64.txt) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) endif() diff --git a/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.windows-x86_64.txt b/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.windows-x86_64.txt new file mode 100644 index 0000000000..17698b5a8f --- /dev/null +++ b/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/CMakeLists.windows-x86_64.txt @@ -0,0 +1,18 @@ + +# This file was generated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_library(utils-backtrace-fake_llvm_symbolizer) +target_link_libraries(utils-backtrace-fake_llvm_symbolizer PUBLIC + contrib-libs-cxxsupp + yutil + lib-DebugInfo-Symbolize +) +target_sources(utils-backtrace-fake_llvm_symbolizer PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yql/utils/backtrace/fake_llvm_symbolizer/fake_llvm_symbolizer.cpp +) diff --git a/ydb/library/yql/utils/backtrace/ya.make b/ydb/library/yql/utils/backtrace/ya.make index 3c7f42e78c..93d5306580 100644 --- a/ydb/library/yql/utils/backtrace/ya.make +++ b/ydb/library/yql/utils/backtrace/ya.make @@ -17,6 +17,9 @@ ELSE() SRCS( symbolizer_dummy.cpp ) + PEERDIR( + ydb/library/yql/utils/backtrace/fake_llvm_symbolizer + ) ENDIF() PEERDIR( |