From: Nico Weber <nicolasweber@gmx.de>
Date: Fri, 13 Sep 2019 12:58:52 +0000 (+0000)
Subject: gn build: (manually) merge r371787
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1b0ea64240a6d96d73d52b50722bd4a424b9269;p=llvm

gn build: (manually) merge r371787

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@371847 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/gn/secondary/clang/tools/libclang/BUILD.gn b/utils/gn/secondary/clang/tools/libclang/BUILD.gn
index eb04b3071fa..a41a34cb9ef 100644
--- a/utils/gn/secondary/clang/tools/libclang/BUILD.gn
+++ b/utils/gn/secondary/clang/tools/libclang/BUILD.gn
@@ -84,6 +84,7 @@ target(libclang_target_type, "libclang") {
     "CXTranslationUnit.h",
     "CXType.cpp",
     "CXType.h",
+    "FatalErrorHandler.cpp",
     "Index_Internal.h",
     "Indexing.cpp",
   ]
diff --git a/utils/gn/secondary/clang/unittests/BUILD.gn b/utils/gn/secondary/clang/unittests/BUILD.gn
index befe73b8d9d..d1382919b5e 100644
--- a/utils/gn/secondary/clang/unittests/BUILD.gn
+++ b/utils/gn/secondary/clang/unittests/BUILD.gn
@@ -31,7 +31,10 @@ group("unittests") {
     # to failures, mostly in libclang.VirtualFileOverlay_*.
     # FIXME: Also, the executable can't find libclang.dll since that's
     # in a different directory.
-    deps += [ "libclang:libclangTests" ]
+    deps += [
+      "libclang:libclangTests",
+      "libclang/CrashTests:libclangCrashTests",
+    ]
   }
   testonly = true
 }
diff --git a/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn b/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
new file mode 100644
index 00000000000..05ce1ecda4c
--- /dev/null
+++ b/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
@@ -0,0 +1,14 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("libclangCrashTests") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/tools/libclang",
+  ]
+  sources = [
+    "LibclangCrashTest.cpp",
+  ]
+  if (host_os == "mac") {
+    ldflags = [ "-Wl,-rpath," + rebase_path("$root_out_dir/lib") ]
+  }
+}