Update GN files to build with r358103
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358790 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn b/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
index e1723e4..b25dec1 100644
--- a/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
+++ b/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
@@ -19,6 +19,7 @@
"//clang-tools-extra/clang-tidy/portability",
"//clang-tools-extra/clang-tidy/readability",
"//clang-tools-extra/clang-tidy/zircon",
+ "//clang-tools-extra/clangd/tool:features",
"//clang/lib/AST",
"//clang/lib/ASTMatchers",
"//clang/lib/Basic",
@@ -37,7 +38,12 @@
"//llvm/utils/gn/build/libs/atomic",
"//llvm/utils/gn/build/libs/pthread",
]
- include_dirs = [ "." ]
+ include_dirs = [
+ ".",
+
+ # To pick up the generated inc files.
+ "$target_gen_dir/tool",
+ ]
sources = [
"AST.cpp",
"Cancellation.cpp",
diff --git a/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn b/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
index 9fe6b27..c59356b 100644
--- a/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
+++ b/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
@@ -13,6 +13,7 @@
}
}
+
executable("clangd") {
configs += [ "//llvm/utils/gn/build:clang_code" ]
deps = [
diff --git a/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn b/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
index a2f3866..2a17350 100644
--- a/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
+++ b/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
@@ -20,7 +20,12 @@
"//llvm/lib/Support",
"//llvm/lib/Testing/Support",
]
- include_dirs = [ "//clang-tools-extra/clangd" ]
+ include_dirs = [
+ "//clang-tools-extra/clangd",
+
+ # To pick up the generated inc files.
+ "$target_gen_dir/../../clangd/tool",
+ ]
sources = [
"Annotations.cpp",
"BackgroundIndexTests.cpp",
