diff options
| author | Louis Dionne <ldionne.2@gmail.com> | 2022-05-18 19:05:45 +0300 |
|---|---|---|
| committer | Louis Dionne <ldionne.2@gmail.com> | 2022-05-19 17:49:36 +0300 |
| commit | fa7ce8e685faa63f7ad1d0c7a640217286ec291b (patch) | |
| tree | d83feacbb44e79454275542ee4c211340a4330a3 /libcxxabi/src/CMakeLists.txt | |
| parent | e601b2a1542710789395ab1121b1ccc7076e39d1 (diff) | |
[runtimes] Fix the build of merged ABI/unwinder libraries
Also, add a CI job that tests this configuration. The exact configuration
is that we build a shared libc++ and merge objects for the ABI library
and the unwinder library into it.
Differential Revision: https://reviews.llvm.org/D125903
Diffstat (limited to 'libcxxabi/src/CMakeLists.txt')
| -rw-r--r-- | libcxxabi/src/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index afaed4fea326..a8c79aa6f380 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -155,6 +155,7 @@ endif() add_library(cxxabi_shared_objects OBJECT EXCLUDE_FROM_ALL ${LIBCXXABI_SOURCES} ${LIBCXXABI_HEADERS}) if (LIBCXXABI_USE_LLVM_UNWINDER) if (LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY) + target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared_objects) # propagate usage requirements target_sources(cxxabi_shared_objects PUBLIC $<TARGET_OBJECTS:unwind_shared_objects>) else() target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared) @@ -228,6 +229,7 @@ endif() # Build the static library. add_library(cxxabi_static_objects OBJECT EXCLUDE_FROM_ALL ${LIBCXXABI_SOURCES} ${LIBCXXABI_HEADERS}) if (LIBCXXABI_USE_LLVM_UNWINDER AND LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY) + target_link_libraries(cxxabi_static_objects PUBLIC unwind_static_objects) # propagate usage requirements target_sources(cxxabi_static_objects PUBLIC $<TARGET_OBJECTS:unwind_static_objects>) endif() target_link_libraries(cxxabi_static_objects PRIVATE cxx-headers ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES}) |