[gn build] (manually) merge 943660fd15f193

lib/Frontend/OpenMP/CMakeLists.txt

@@ -15,4 +15,4 @@ add_llvm_component_library(LLVMFrontendOpenMP
   intrinsics_gen
   omp_gen
   omp_cpp
-  )
+  )

utils/gn/secondary/llvm/include/llvm/Frontend/OpenMP/BUILD.gn

@@ -6,13 +6,6 @@ tablegen("OMP") {
   output_name = "OMP.h.inc"
 }
 
-tablegen("OMPImpl") {
-  visibility = [ ":public_tablegen" ]
-  args = [ "-gen-directive-impl" ]
-  td_file = "OMP.td"
-  output_name = "OMP.cpp.inc"
-}
-
 # Groups all tablegen() calls that create .inc files that are included in
 # Frontent/OpenMP's public headers (just one so far).
 # //llvm/lib/Frontend/OpenMP has this as a public_dep, so targets depending on
@@ -21,6 +14,5 @@ group("public_tablegen") {
   public_deps = [
     # Frontend/OpenMP's public headers include OMP.h.inc.
     ":OMP",
-    ":OMPImpl",
   ]
 }

utils/gn/secondary/llvm/lib/Frontend/OpenMP/BUILD.gn

@@ -1,14 +1,23 @@
+import("//llvm/utils/TableGen/tablegen.gni")
+
+tablegen("OMPImpl") {
+  visibility = [ ":OpenMP" ]
+  args = [ "-gen-directive-impl" ]
+  td_file = "//llvm/include/llvm/Frontend/OpenMP/OMP.td"
+  output_name = "OMP.cpp"
+}
+
 static_library("OpenMP") {
   output_name = "LLVMFrontendOpenMP"
   deps = [
+    ":OMPImpl",
     "//llvm/lib/IR",
     "//llvm/lib/Support",
     "//llvm/lib/Transforms/Utils",
   ]
   public_deps = [ "//llvm/include/llvm/Frontend/OpenMP:public_tablegen" ]
   sources = [
-    "OMP.cpp.inc",
     "OMPContext.cpp",
     "OMPIRBuilder.cpp",
-  ]
+  ] + get_target_outputs(":OMPImpl")
 }