commit cdc56e36c2f14de80352d3fe1087e57307d9b261
author Louis Dionne <ldionne@apple.com> Tue Jun 02 12:21:01 2020 -0400
committer Copybara-Service <copybara-worker@google.com> Fri Aug 28 01:05:53 2020 -0700
tree b4b861eb1a3ae5a0211dd64ed743d2be8d38a884
parent dc9d5ff58c8353b8f0bc6ea448be2d66e10a50d1

[libc++abi] Make sure we link in CrashReporterClient.a when it's present

When building the system libc++abi for Apple, we use CrashReporterClient
to provide better crash logs when calling abort(). This is exemplified by
the fact that we test for the presence of <CrashReporterClient.h> in
abort_message.cpp.

However, we must link against CrashReporterClient.a in order to get that
functionality, otherwise we get a linking error.

GitOrigin-RevId: 6f6c8a2d96f580c79e00c43d0ec368346c7bff49

src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b837a4..d5251ac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -135,6 +135,17 @@
       add_link_flags("-Wl,-rpath,${LIBDIR}")
     endif()
   endif()
+
+  # Make sure we link in CrashReporterClient if we find it -- it's used by
+  # abort() on Apple platforms when building the system dylib.
+  find_library(CrashReporterClient NAMES libCrashReporterClient.a
+                                   PATHS "${CMAKE_OSX_SYSROOT}/usr/local/lib")
+  if (CrashReporterClient)
+    message(STATUS "Linking with CrashReporterClient at ${CrashReporterClient}")
+    add_library_flags("${CrashReporterClient}")
+  else()
+    message(STATUS "Could not find CrashReporterClient, not linking against it")
+  endif()
 endif()
 
 split_list(LIBCXXABI_COMPILE_FLAGS)