[llvm] r363583 - gn build: Merge r363541

[Nico Weber via llvm-commits]

Author: nico
Date: Mon Jun 17 10:45:12 2019
New Revision: 363583

URL: http://llvm.org/viewvc/llvm-project?rev=363583&view=rev
Log:
gn build: Merge r363541

Modified:
    llvm/trunk/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
    llvm/trunk/utils/gn/secondary/clang/lib/Sema/BUILD.gn

Modified: llvm/trunk/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn?rev=363583&r1=363582&r2=363583&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn Mon Jun 17 10:45:12 2019
@@ -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") {

Modified: llvm/trunk/utils/gn/secondary/clang/lib/Sema/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang/lib/Sema/BUILD.gn?rev=363583&r1=363582&r2=363583&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/clang/lib/Sema/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/clang/lib/Sema/BUILD.gn Mon Jun 17 10:45:12 2019
@@ -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",