diff options
| author | thegeorg <thegeorg@yandex-team.ru> | 2022-05-31 22:04:58 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.ru> | 2022-05-31 22:04:58 +0300 |
| commit | 8e06e0cf4243215c1a58157fdea771fef02ed9e3 (patch) | |
| tree | 55942c3364320a726ea1fa5bdf06c3e7e01c2f23 | |
| parent | ceb13dcc40dd5e11c8e3189b3c15b3bd5897d4ac (diff) | |
| download | ydb-8e06e0cf4243215c1a58157fdea771fef02ed9e3.tar.gz | |
Remove libcxx/include/cxxabi.h header as it does not belong to libcxx
ref:b9a880c5e3be99eec95cca2118f454e7c78a1de6
| -rw-r--r-- | build/sysincl/stl-to-libcxx.yml | 3 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/cxxabi.h | 9 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/include/cxxabi.h | 1 |
4 files changed, 4 insertions, 12 deletions
diff --git a/build/sysincl/stl-to-libcxx.yml b/build/sysincl/stl-to-libcxx.yml index d14443bbb5..e16ac3d7b6 100644 --- a/build/sysincl/stl-to-libcxx.yml +++ b/build/sysincl/stl-to-libcxx.yml @@ -30,8 +30,7 @@ - includes: - cxxabi.h: - - contrib/libs/cxxsupp/libcxx/include/cxxabi.h - - contrib/libs/cxxsupp/libcxxrt/cxxabi.h + - contrib/libs/cxxsupp/libcxxrt/include/cxxabi.h - omp.h: - contrib/libs/cxxsupp/openmp/omp.h - unwind.h: diff --git a/contrib/libs/cxxsupp/libcxx/CMakeLists.txt b/contrib/libs/cxxsupp/libcxx/CMakeLists.txt index 02a245a1fc..34941d8f48 100644 --- a/contrib/libs/cxxsupp/libcxx/CMakeLists.txt +++ b/contrib/libs/cxxsupp/libcxx/CMakeLists.txt @@ -18,11 +18,12 @@ target_compile_options(libs-cxxsupp-libcxx PRIVATE ) target_include_directories(libs-cxxsupp-libcxx PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/cxxsupp/libcxx/include + ${CMAKE_SOURCE_DIR}/contrib/libs/cxxsupp/libcxxrt/include ) target_include_directories(libs-cxxsupp-libcxx PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/cxxsupp/libcxx/include ${CMAKE_SOURCE_DIR}/contrib/libs/cxxsupp/libcxx/src - ${CMAKE_SOURCE_DIR}/contrib/libs/cxxsupp/libcxxrt + ${CMAKE_SOURCE_DIR}/contrib/libs/cxxsupp/libcxxrt/include ) target_link_libraries(libs-cxxsupp-libcxx PUBLIC libs-cxxsupp-libcxxabi-parts diff --git a/contrib/libs/cxxsupp/libcxx/include/cxxabi.h b/contrib/libs/cxxsupp/libcxx/include/cxxabi.h deleted file mode 100644 index 3b1edaf75a..0000000000 --- a/contrib/libs/cxxsupp/libcxx/include/cxxabi.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#if defined(__IOS__) || defined(__ANDROID__) -#include_next <cxxabi.h> -#elif defined(_WIN32) -// pass -#else -#include <contrib/libs/cxxsupp/libcxxrt/cxxabi.h> -#endif diff --git a/contrib/libs/cxxsupp/libcxxrt/include/cxxabi.h b/contrib/libs/cxxsupp/libcxxrt/include/cxxabi.h new file mode 100644 index 0000000000..8a348a12c9 --- /dev/null +++ b/contrib/libs/cxxsupp/libcxxrt/include/cxxabi.h @@ -0,0 +1 @@ +#include "../cxxabi.h" /* inclink generated by yamaker */ |