gn build: Merge r363242

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

diff --git a/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn b/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
index bbd5684..7d67a2f 100644 (file)
--- a/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
+++ b/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
@@ -89,14 +89,6 @@ clang_tablegen("AttrHasAttributeImpl") {
   td_file = "Attr.td"
 }
 
-clang_tablegen("OpenCLBuiltins") {
-  args = [
-    "-gen-clang-opencl-builtins",
-    "-I",
-    rebase_path("../..", root_out_dir),
-  ]
-}
-
 # Misc
 
 clang_tablegen("arm_neon") {

diff --git a/utils/gn/secondary/clang/lib/Sema/BUILD.gn b/utils/gn/secondary/clang/lib/Sema/BUILD.gn
index 5364956..ab7486d 100644 (file)
--- a/utils/gn/secondary/clang/lib/Sema/BUILD.gn
+++ b/utils/gn/secondary/clang/lib/Sema/BUILD.gn
@@ -1,8 +1,14 @@
+import("//clang/utils/TableGen/clang_tablegen.gni")
+
+clang_tablegen("OpenCLBuiltins") {
+  args = [ "-gen-clang-opencl-builtins" ]
+}
+
 static_library("Sema") {
   output_name = "clangSema"
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [
-    "//clang/include/clang/Basic:OpenCLBuiltins",
+    ":OpenCLBuiltins",
     "//clang/include/clang/Sema:AttrParsedAttrImpl",
     "//clang/include/clang/Sema:AttrParsedAttrKinds",
     "//clang/include/clang/Sema:AttrParsedAttrList",