[gn] port f63d33d (clangOptions)

Author: nico

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

@@ -52,6 +52,7 @@ static_library("clangd") {
     "//clang/lib/Frontend",
     "//clang/lib/Index",
     "//clang/lib/Lex",
+    "//clang/lib/Options",
     "//clang/lib/Sema",
     "//clang/lib/Serialization",
     "//clang/lib/Tooling",

llvm/utils/gn/secondary/clang-tools-extra/modularize/BUILD.gn

@@ -6,6 +6,7 @@ executable("modularize") {
     "//clang/lib/Driver",
     "//clang/lib/Frontend",
     "//clang/lib/Lex",
+    "//clang/lib/Options",
     "//clang/lib/Serialization",
     "//clang/lib/Tooling",
     "//llvm/lib/Option",

llvm/utils/gn/secondary/clang-tools-extra/pp-trace/BUILD.gn

@@ -5,6 +5,7 @@ executable("pp-trace") {
     "//clang/lib/Basic",
     "//clang/lib/Frontend",
     "//clang/lib/Lex",
+    "//clang/lib/Options",
     "//clang/lib/Serialization",
     "//clang/lib/Tooling",
     "//llvm/lib/Support",

llvm/utils/gn/secondary/clang/include/clang/Driver/BUILD.gn renamed to llvm/utils/gn/secondary/clang/include/clang/Options/BUILD.gn

@@ -21,10 +21,6 @@ static_library("Driver") {
     "//llvm/lib/TargetParser",
     "//llvm/lib/WindowsDriver",
   ]
-  public_deps = [
-    # public_dep because public header Options.h includes generated Options.inc.
-    "//clang/include/clang/Driver:Options",
-  ]
   if (host_os == "win") {
     # MSVCToolChain.cpp uses version.dll.
     libs = [ "version.lib" ]
@@ -34,12 +30,10 @@ static_library("Driver") {
     "Compilation.cpp",
     "Distro.cpp",
     "Driver.cpp",
-    "DriverOptions.cpp",
     "Job.cpp",
     "Multilib.cpp",
     "MultilibBuilder.cpp",
     "OffloadBundler.cpp",
-    "OptionUtils.cpp",
     "Phases.cpp",
     "SanitizerArgs.cpp",
     "Tool.cpp",

llvm/utils/gn/secondary/clang/lib/Driver/BUILD.gn

@@ -9,6 +9,7 @@ static_library("Frontend") {
     "//clang/lib/Driver",
     "//clang/lib/Edit",
     "//clang/lib/Lex",
+    "//clang/lib/Options",
     "//clang/lib/Parse",
     "//clang/lib/Sema",
     "//clang/lib/Serialization",

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

@@ -11,6 +11,7 @@ static_library("FrontendTool") {
     "//clang/lib/ExtractAPI",
     "//clang/lib/Frontend",
     "//clang/lib/Frontend/Rewrite",
+    "//clang/lib/Options",
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]

llvm/utils/gn/secondary/clang/lib/FrontendTool/BUILD.gn

@@ -0,0 +1,19 @@
+static_library("Options") {
+  output_name = "clangOptions"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  include_dirs = [ "." ]
+  deps = [
+    "//clang/include/clang/Config",
+    "//clang/lib/Basic",
+    "//llvm/lib/Option",
+    "//llvm/lib/Support",
+  ]
+  public_deps = [
+    # public_dep because public header Options.h includes generated Options.inc.
+    "//clang/include/clang/Options:Options",
+  ]
+  sources = [
+    "DriverOptions.cpp",
+    "OptionUtils.cpp",
+  ]
+}

llvm/utils/gn/secondary/clang/lib/Options/BUILD.gn

@@ -2,14 +2,15 @@ static_library("Tooling") {
   output_name = "clangTooling"
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [
-    "//clang/include/clang/Driver:Options",
+    "//clang/include/clang/Options:Options",
     "//clang/lib/AST",
     "//clang/lib/ASTMatchers",
     "//clang/lib/Basic",
     "//clang/lib/Driver",
     "//clang/lib/Format",
     "//clang/lib/Frontend",
     "//clang/lib/Lex",
+    "//clang/lib/Options",
     "//clang/lib/Rewrite",
     "//clang/lib/Tooling/Core",
     "//llvm/lib/TargetParser",

llvm/utils/gn/secondary/clang/lib/Tooling/BUILD.gn

@@ -6,6 +6,7 @@ executable("clang-check") {
     "//clang/lib/Driver",
     "//clang/lib/Frontend",
     "//clang/lib/Frontend/Rewrite",
+    "//clang/lib/Options",
     "//clang/lib/StaticAnalyzer/Frontend",
     "//clang/lib/Tooling",
     "//clang/lib/Tooling/Syntax",