Revert "[gn build] (manually) kind of merge d627a27d26"
This reverts commit5123327eda.d627a27d26was reverted ine0f70a8a97.
This commit is contained in:
parent
e0f70a8a97
commit
237526319c
|
|
@ -1,19 +1,7 @@
|
||||||
# FIXME: The cmake build runs DumpTool:clang-ast-dump to generate a json
|
|
||||||
# file and feeds it into this step in non-debug builds or if an option is set.
|
|
||||||
action("node_introspection_inc") {
|
|
||||||
script = "DumpTool/generate_cxx_src_locs.py"
|
|
||||||
outputs = [ "$target_gen_dir/clang/Tooling/NodeIntrospection.inc" ]
|
|
||||||
args = [
|
|
||||||
"--empty-implementation=1",
|
|
||||||
"--output-file=" + rebase_path(outputs[0], root_build_dir),
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
static_library("Tooling") {
|
static_library("Tooling") {
|
||||||
output_name = "clangTooling"
|
output_name = "clangTooling"
|
||||||
configs += [ "//llvm/utils/gn/build:clang_code" ]
|
configs += [ "//llvm/utils/gn/build:clang_code" ]
|
||||||
deps = [
|
deps = [
|
||||||
":node_introspection_inc",
|
|
||||||
"//clang/include/clang/Driver:Options",
|
"//clang/include/clang/Driver:Options",
|
||||||
"//clang/lib/AST",
|
"//clang/lib/AST",
|
||||||
"//clang/lib/ASTMatchers",
|
"//clang/lib/ASTMatchers",
|
||||||
|
|
@ -25,7 +13,6 @@ static_library("Tooling") {
|
||||||
"//clang/lib/Rewrite",
|
"//clang/lib/Rewrite",
|
||||||
"//clang/lib/Tooling/Core",
|
"//clang/lib/Tooling/Core",
|
||||||
]
|
]
|
||||||
include_dirs = [ target_gen_dir ]
|
|
||||||
sources = [
|
sources = [
|
||||||
"AllTUsExecution.cpp",
|
"AllTUsExecution.cpp",
|
||||||
"ArgumentsAdjusters.cpp",
|
"ArgumentsAdjusters.cpp",
|
||||||
|
|
@ -38,7 +25,6 @@ static_library("Tooling") {
|
||||||
"GuessTargetAndModeCompilationDatabase.cpp",
|
"GuessTargetAndModeCompilationDatabase.cpp",
|
||||||
"InterpolatingCompilationDatabase.cpp",
|
"InterpolatingCompilationDatabase.cpp",
|
||||||
"JSONCompilationDatabase.cpp",
|
"JSONCompilationDatabase.cpp",
|
||||||
"NodeIntrospection.cpp",
|
|
||||||
"Refactoring.cpp",
|
"Refactoring.cpp",
|
||||||
"RefactoringCallbacks.cpp",
|
"RefactoringCallbacks.cpp",
|
||||||
"StandaloneExecution.cpp",
|
"StandaloneExecution.cpp",
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
executable("clang-ast-dump") {
|
|
||||||
configs += [ "//llvm/utils/gn/build:clang_code" ]
|
|
||||||
deps = [
|
|
||||||
"//clang/lib/AST",
|
|
||||||
"//clang/lib/ASTMatchers",
|
|
||||||
"//clang/lib/Basic",
|
|
||||||
"//clang/lib/Driver",
|
|
||||||
"//clang/lib/Format",
|
|
||||||
"//clang/lib/Frontend",
|
|
||||||
"//clang/lib/Lex",
|
|
||||||
"//clang/lib/Rewrite",
|
|
||||||
"//clang/lib/Serialization",
|
|
||||||
"//clang/lib/Tooling/Core",
|
|
||||||
]
|
|
||||||
|
|
||||||
sources = [
|
|
||||||
"ASTSrcLocProcessor.cpp",
|
|
||||||
"ClangSrcLocDump.cpp",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
@ -12,7 +12,6 @@ group("unittests") {
|
||||||
"Format:FormatTests",
|
"Format:FormatTests",
|
||||||
"Frontend:FrontendTests",
|
"Frontend:FrontendTests",
|
||||||
"Index:IndexTests",
|
"Index:IndexTests",
|
||||||
"Introspection:IntrospectionTests",
|
|
||||||
"Lex:LexTests",
|
"Lex:LexTests",
|
||||||
"Rename:ClangRenameTests",
|
"Rename:ClangRenameTests",
|
||||||
"Rewrite:RewriteTests",
|
"Rewrite:RewriteTests",
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
import("//llvm/utils/unittest/unittest.gni")
|
|
||||||
|
|
||||||
unittest("IntrospectionTests") {
|
|
||||||
configs += [ "//llvm/utils/gn/build:clang_code" ]
|
|
||||||
deps = [
|
|
||||||
"//clang/lib/AST",
|
|
||||||
"//clang/lib/ASTMatchers",
|
|
||||||
"//clang/lib/Basic",
|
|
||||||
"//clang/lib/Frontend",
|
|
||||||
"//clang/lib/Serialization",
|
|
||||||
"//clang/lib/Tooling",
|
|
||||||
"//llvm/lib/Support",
|
|
||||||
"//llvm/lib/Testing/Support",
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
defines = [ "SKIP_INTROSPECTION_GENERATION" ]
|
|
||||||
|
|
||||||
sources = [ "IntrospectionTest.cpp" ]
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue