This is an archive of the discontinued LLVM Phabricator instance.

Differential D129469

[libcxxabi][CMake] Set --unwindlib=none when using LLVM libunwind
ClosedPublic

Authored by phosek on Jul 11 2022, 12:58 AM.

Details

Reviewers
ldionne
mstorsjo
Group Reviewers
Restricted Project
Commits
rG1f3f4833eae7: [libcxxabi][CMake] Set --unwindlib=none when using LLVM libunwind
Summary

We already link libunwind explicitly so avoid trying to link toolchain's
default libunwind which may be missing. This matches what we already do
for libcxx.

Diff Detail

Event Timeline

phosek created this revision.Jul 11 2022, 12:58 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 11 2022, 12:58 AM
Herald added a subscriber: mgorny. · View Herald Transcript
phosek requested review of this revision.Jul 11 2022, 12:58 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 11 2022, 12:58 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
phosek edited the summary of this revision. (Show Details)Jul 11 2022, 12:59 AM
Harbormaster completed remote builds in B174616: Diff 443570.Jul 11 2022, 1:23 AM
ldionne accepted this revision.Jul 14 2022, 6:53 AM
This revision is now accepted and ready to land.Jul 14 2022, 6:53 AM
This revision was landed with ongoing or failed builds.Jul 14 2022, 11:59 AM
Closed by commit rG1f3f4833eae7: [libcxxabi][CMake] Set --unwindlib=none when using LLVM libunwind (authored by phosek). · Explain Why
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rG1f3f4833eae7: [libcxxabi][CMake] Set --unwindlib=none when using LLVM libunwind.

Revision Contents

PathSize
libcxxabi/
src/
7 lines

Diff 444757

libcxxabi/src/CMakeLists.txt

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines
# Setup flags. # Setup flags.
if (CXX_SUPPORTS_NOSTDLIBXX_FLAG) if (CXX_SUPPORTS_NOSTDLIBXX_FLAG)
add_link_flags_if_supported(-nostdlib++) add_link_flags_if_supported(-nostdlib++)
else() else()
add_link_flags_if_supported(-nodefaultlibs) add_link_flags_if_supported(-nodefaultlibs)
endif() endif()
if (CXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG AND LIBCXXABI_USE_LLVM_UNWINDER)
# If we're linking directly against the libunwind that we're building
# in the same invocation, don't try to link in the toolchain's
# default libunwind (which may be missing still).
add_link_flags_if_supported(--unwindlib=none)
endif()
if ( APPLE ) if ( APPLE )
if (LLVM_USE_SANITIZER) if (LLVM_USE_SANITIZER)
if (("${LLVM_USE_SANITIZER}" STREQUAL "Address") OR if (("${LLVM_USE_SANITIZER}" STREQUAL "Address") OR
("${LLVM_USE_SANITIZER}" STREQUAL "Address;Undefined") OR ("${LLVM_USE_SANITIZER}" STREQUAL "Address;Undefined") OR
("${LLVM_USE_SANITIZER}" STREQUAL "Undefined;Address")) ("${LLVM_USE_SANITIZER}" STREQUAL "Undefined;Address"))
set(LIBFILE "libclang_rt.asan_osx_dynamic.dylib") set(LIBFILE "libclang_rt.asan_osx_dynamic.dylib")
elseif("${LLVM_USE_SANITIZER}" STREQUAL "Undefined") elseif("${LLVM_USE_SANITIZER}" STREQUAL "Undefined")
set(LIBFILE "libclang_rt.ubsan_osx_dynamic.dylib") set(LIBFILE "libclang_rt.ubsan_osx_dynamic.dylib")
▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines