[PATCH] D60919: [gn] Put features target_gen_dir to clangd include_dirs

[Petr Hosek via Phabricator via llvm-commits]

phosek created this revision.
phosek added a reviewer: thakis.
Herald added subscribers: llvm-commits, kadircet, arphaman, jkorous, MaskRay, ioeric, ilya-biryukov.
Herald added a project: LLVM.

ClangdLSPServer and clangd unittests now include Features.inc so we
need to append the target_gen_dir that contains it to their
include_dirs.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D60919

Files:
  llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
  llvm/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn


Index: llvm/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
+++ llvm/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
@@ -20,7 +20,10 @@
     "//llvm/lib/Support",
     "//llvm/lib/Testing/Support",
   ]
-  include_dirs = [ "//clang-tools-extra/clangd" ]
+  include_dirs = [
+    "//clang-tools-extra/clangd",
+    get_label_info("//clang-tools-extra/clangd/tool:features", "target_gen_dir"),
+  ]
   sources = [
     "Annotations.cpp",
     "BackgroundIndexTests.cpp",
Index: llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
+++ llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
@@ -37,7 +37,10 @@
     "//llvm/utils/gn/build/libs/atomic",
     "//llvm/utils/gn/build/libs/pthread",
   ]
-  include_dirs = [ "." ]
+  include_dirs = [
+    ".",
+    get_label_info("//clang-tools-extra/clangd/tool:features", "target_gen_dir"),
+  ]
   sources = [
     "AST.cpp",
     "Cancellation.cpp",


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60919.195906.patch
Type: text/x-patch
Size: 1205 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190419/dbbd5083/attachment.bin>