This is an archive of the discontinued LLVM Phabricator instance.

Differential D113481

[libcxx] Add a dependency on unwind for tests, if LIBCXXABI_USE_LLVM_UNWINDER is set
AbandonedPublic

Authored by mstorsjo on Nov 9 2021, 5:29 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Summary

Normally when LIBCXXABI_USE_LLVM_UNWINDER is set, the cxx target in
itself also depends on unwind, but if only building a static libcxx,
building libcxx doesn't build libunwind.

This is an alternative to D113467.

Diff Detail

Event Timeline

mstorsjo created this revision.Nov 9 2021, 5:29 AM
Herald added a subscriber: mgorny. · View Herald TranscriptNov 9 2021, 5:29 AM
mstorsjo requested review of this revision.Nov 9 2021, 5:29 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 9 2021, 5:29 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B133235: Diff 385785.Nov 9 2021, 6:36 AM
ldionne mentioned this in D113467: [libcxx] Add a dependency on unwind in cxx_static, if LIBCXXABI_USE_LLVM_UNWINDER is set.Nov 9 2021, 7:17 AM
mstorsjo abandoned this revision.Nov 9 2021, 7:46 AM

Went with D113467 after all.

Revision Contents

PathSize
libcxx/
4 lines

Diff 385785

libcxx/CMakeLists.txt

Show First 20 Lines • Show All 955 Lines • ▼ Show 20 Lines
if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY) if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)
list(APPEND LIBCXX_TEST_DEPS cxx_experimental) list(APPEND LIBCXX_TEST_DEPS cxx_experimental)
endif() endif()
if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)
list(APPEND LIBCXX_TEST_DEPS cxx_external_threads) list(APPEND LIBCXX_TEST_DEPS cxx_external_threads)
endif() endif()
if (LIBCXXABI_USE_LLVM_UNWINDER)
list(APPEND LIBCXX_TEST_DEPS unwind)
endif()
if (LIBCXX_INCLUDE_BENCHMARKS) if (LIBCXX_INCLUDE_BENCHMARKS)
add_subdirectory(benchmarks) add_subdirectory(benchmarks)
endif() endif()
if (LIBCXX_INCLUDE_TESTS) if (LIBCXX_INCLUDE_TESTS)
add_subdirectory(test) add_subdirectory(test)
add_subdirectory(lib/abi) add_subdirectory(lib/abi)
if (LIBCXX_STANDALONE_BUILD) if (LIBCXX_STANDALONE_BUILD)
Show All 13 Lines