Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CMake][PGO] Add libunwind to list of stage1 runtimes #78869

Merged
merged 1 commit into from
Jan 23, 2024

Conversation

tstellar
Copy link
Collaborator

@tstellar tstellar commented Jan 21, 2024

This fixes the build since 8f90e69 which made libcxxabi use llvm's libunwind by default.

Fixes #78487

This fixes the build since 8f90e69
which made libcxxabi use llvm's libunwind by default.
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Jan 21, 2024
@llvmbot
Copy link
Member

llvmbot commented Jan 21, 2024

@llvm/pr-subscribers-clang

Author: Tom Stellard (tstellar)

Changes

This fixes the build since 8f90e69 which made libcxxabi use llvm's libunwind by default.


Full diff: https://github.com/llvm/llvm-project/pull/78869.diff

1 Files Affected:

  • (modified) clang/cmake/caches/PGO.cmake (+1-1)
diff --git a/clang/cmake/caches/PGO.cmake b/clang/cmake/caches/PGO.cmake
index e1d0585e453f82..15bc755d110d19 100644
--- a/clang/cmake/caches/PGO.cmake
+++ b/clang/cmake/caches/PGO.cmake
@@ -2,7 +2,7 @@ set(CMAKE_BUILD_TYPE RELEASE CACHE STRING "")
 set(CLANG_ENABLE_BOOTSTRAP ON CACHE BOOL "")
 
 set(LLVM_ENABLE_PROJECTS "clang;lld" CACHE STRING "")
-set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "")
+set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "")
 
 set(LLVM_TARGETS_TO_BUILD Native CACHE STRING "")
 set(BOOTSTRAP_LLVM_BUILD_INSTRUMENTED ON CACHE BOOL "")

@boomanaiden154
Copy link
Contributor

This fixes #78487.

@ldionne ldionne merged commit f2a2f80 into llvm:main Jan 23, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

LIBCXXABI_USE_LLVM_UNWINDER=ON breaks PGO build
5 participants