fix crash log magic

git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@152693 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/buildit b/lib/buildit
index a3c2488..75a7028 100755
--- a/lib/buildit
+++ b/lib/buildit
@@ -53,6 +53,10 @@
         -compatibility_version 1 \
         -install_name /usr/lib/libc++abi.dylib \
         -lSystem"
+	if [ -f "${SDKROOT}/usr/local/lib/libCrashReporterClient.a" ]
+	then
+		LDSHARED_FLAGS+=" -lCrashReporterClient"
+	fi
     ;;
   *-*-mingw*)
     # FIXME: removing libgcc and libsupc++ dependencies means porting libcxxrt and LLVM/compiler-rt
diff --git a/src/abort_message.cpp b/src/abort_message.cpp
index 7beb86b..3da4ef6 100644
--- a/src/abort_message.cpp
+++ b/src/abort_message.cpp
@@ -18,16 +18,6 @@
 #   if defined(__has_include) && __has_include(<CrashReporterClient.h>)
 #       define HAVE_CRASHREPORTERCLIENT_H 1
 #       include <CrashReporterClient.h>
-
-        //  If any clients of llvm try to link to libCrashReporterClient.a themselves,
-        //  only one crash info struct will be used.
-        extern "C" {
-        CRASH_REPORTER_CLIENT_HIDDEN 
-        struct crashreporter_annotations_t gCRAnnotations 
-                __attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) 
-                = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0 };
-        }
-
 #   endif
 #endif