From 521eae8a46ff5e1b07e8f2a27a9d63b1b07c0d94 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 13 Jun 2019 20:25:18 +0000 Subject: [PATCH] gn build: Merge r363242 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@363324 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/gn/secondary/clang/include/clang/Basic/BUILD.gn | 8 -------- utils/gn/secondary/clang/lib/Sema/BUILD.gn | 8 +++++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn b/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn index bbd56848947..7d67a2f96ce 100644 --- 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 53649562dab..ab7486dfd23 100644 --- 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", -- 2.11.0