diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2024-01-15 12:47:23 -0800 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2024-01-15 12:58:23 -0800 |
| commit | 837503023a196fef76abe66102a89ca4dedee039 (patch) | |
| tree | aba51da3d01019f004503b6e151ef2fc71a2b561 | |
| parent | 92126ca62e5764f9267524c18f78fe0b8c5751c0 (diff) | |
| download | llvm-837503023a196fef76abe66102a89ca4dedee039.zip llvm-837503023a196fef76abe66102a89ca4dedee039.tar.gz llvm-837503023a196fef76abe66102a89ca4dedee039.tar.bz2 | |
[sanitizer] Fix builds after #77991
| -rw-r--r-- | compiler-rt/cmake/Modules/AddCompilerRT.cmake | 1 | ||||
| -rwxr-xr-x | compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index 7aca0ab..e0400a8 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -688,6 +688,7 @@ macro(add_custom_libcxx name prefix) -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY -DLLVM_PATH=${LLVM_MAIN_SRC_DIR} -DLLVM_ENABLE_RUNTIMES=libcxx|libcxxabi + -DLIBCXXABI_USE_LLVM_UNWINDER=OFF -DLIBCXXABI_ENABLE_SHARED=OFF -DLIBCXXABI_HERMETIC_STATIC_LIBRARY=ON -DLIBCXXABI_INCLUDE_TESTS=OFF diff --git a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh index c9e31be..f24d42c 100755 --- a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh +++ b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh @@ -104,6 +104,7 @@ if [[ ! -f ${LLVM_BUILD}/build.ninja ]]; then -DCMAKE_CXX_FLAGS_RELEASE="${LIBCXX_FLAGS}" \ -DLIBCXXABI_ENABLE_ASSERTIONS=OFF \ -DLIBCXXABI_ENABLE_EXCEPTIONS=OFF \ + -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \ -DLIBCXX_ENABLE_ASSERTIONS=OFF \ -DLIBCXX_ENABLE_EXCEPTIONS=OFF \ -DLIBCXX_ENABLE_RTTI=OFF \ |