Skip to content

Commit 957be9f

Browse files
ldionneronlieb
authored andcommitted
[libc++abi] Improve error message when libunwind is missing from LLVM_ENABLE_RUNTIMES (llvm#77991)
This doesn't actually prevent the build from failing, but it provides a better diagnostic that explains what is needed in order to fix the build. Fixes llvm#77846 Fixes llvm#77843 Change-Id: I4ad40d4c7ba2472ff75bf4c20cba1f9034507a75
1 parent f75922c commit 957be9f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

libcxxabi/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ option(LIBCXXABI_ENABLE_ASSERTIONS "Enable assertions independent of build mode.
4747
option(LIBCXXABI_ENABLE_PEDANTIC "Compile with pedantic enabled." OFF)
4848
option(LIBCXXABI_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF)
4949
option(LIBCXXABI_USE_LLVM_UNWINDER "Build and use the LLVM unwinder." ON)
50+
if (LIBCXXABI_USE_LLVM_UNWINDER AND NOT "libunwind" IN_LIST LLVM_ENABLE_RUNTIMES)
51+
message(FATAL_ERROR "LIBCXXABI_USE_LLVM_UNWINDER is set to ON, but libuwnind is not specified in LLVM_ENABLE_RUNTIMES.")
52+
endif()
5053
option(LIBCXXABI_ENABLE_STATIC_UNWINDER "Statically link the LLVM unwinder." OFF)
5154
option(LIBCXXABI_USE_COMPILER_RT "Use compiler-rt instead of libgcc" OFF)
5255
option(LIBCXXABI_ENABLE_THREADS "Build with threads enabled" ON)

revert_patches.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
Reverts: breaks HIP tests in wPSDB and nPSDB
22
[AMDGPU] Add dynamic LDS size implicit kernel argument t
3-
4-
Reverts due to libunwind
5-
[libc++abi] Improve error message when libunwind is missing from LLVM_ENABLE_RUNTIMES (#77991)

0 commit comments

Comments
 (0)