[llvm] r367340 - gn build: Fix check-clang-tools after r362702.

[Hans Wennborg via llvm-commits]

Merged together with r367341 to release_90 in r367390.

On Tue, Jul 30, 2019 at 8:16 PM Nico Weber via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
> Author: nico
> Date: Tue Jul 30 11:16:55 2019
> New Revision: 367340
>
> URL: http://llvm.org/viewvc/llvm-project?rev=367340&view=rev
> Log:
> gn build: Fix check-clang-tools after r362702.
>
> r362702 added a test that requires clang-tidy to be linked
> into libclang, so add that to the gn build.
>
> Differential Revision: https://reviews.llvm.org/D65462
>
> Added:
>     llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/
>     llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn
> Modified:
>     llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn
>     llvm/trunk/utils/gn/secondary/clang/tools/libclang/BUILD.gn
>
> Added: llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn?rev=367340&view=auto
> ==============================================================================
> --- llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn (added)
> +++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn Tue Jul 30 11:16:55 2019
> @@ -0,0 +1,18 @@
> +static_library("plugin") {
> +  output_name = "clangIncludeFixerPlugin"
> +  configs += [ "//llvm/utils/gn/build:clang_code" ]
> +  deps = [
> +    "//clang-tools-extra/clang-include-fixer",
> +    "//clang/lib/AST",
> +    "//clang/lib/Basic",
> +    "//clang/lib/Frontend",
> +    "//clang/lib/Parse",
> +    "//clang/lib/Sema",
> +    "//clang/lib/Tooling",
> +    "//llvm/utils/gn/build/libs/pthread",
> +  ]
> +
> +  sources = [
> +    "IncludeFixerPlugin.cpp",
> +  ]
> +}
>
> Modified: llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn?rev=367340&r1=367339&r2=367340&view=diff
> ==============================================================================
> --- llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn (original)
> +++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn Tue Jul 30 11:16:55 2019
> @@ -1,3 +1,5 @@
> +import("//clang/lib/StaticAnalyzer/Frontend/enable.gni")
> +
>  static_library("plugin") {
>    output_name = "clangTidyPlugin"
>    configs += [ "//llvm/utils/gn/build:clang_code" ]
> @@ -12,10 +14,12 @@ static_library("plugin") {
>      "//clang-tools-extra/clang-tidy/fuchsia",
>      "//clang-tools-extra/clang-tidy/google",
>      "//clang-tools-extra/clang-tidy/hicpp",
> +    "//clang-tools-extra/clang-tidy/linuxkernel",
>      "//clang-tools-extra/clang-tidy/llvm",
>      "//clang-tools-extra/clang-tidy/misc",
>      "//clang-tools-extra/clang-tidy/modernize",
>      "//clang-tools-extra/clang-tidy/objc",
> +    "//clang-tools-extra/clang-tidy/openmp",
>      "//clang-tools-extra/clang-tidy/performance",
>      "//clang-tools-extra/clang-tidy/portability",
>      "//clang-tools-extra/clang-tidy/readability",
>
> Modified: llvm/trunk/utils/gn/secondary/clang/tools/libclang/BUILD.gn
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang/tools/libclang/BUILD.gn?rev=367340&r1=367339&r2=367340&view=diff
> ==============================================================================
> --- llvm/trunk/utils/gn/secondary/clang/tools/libclang/BUILD.gn (original)
> +++ llvm/trunk/utils/gn/secondary/clang/tools/libclang/BUILD.gn Tue Jul 30 11:16:55 2019
> @@ -39,8 +39,22 @@ target(libclang_target_type, "libclang")
>      deps += [ "//clang/lib/ARCMigrate" ]
>    }
>
> +  defines = []
> +
> +  # FIXME: Once the GN build has a way to select which bits to build,
> +  # only include this dependency if clang-tools-extra is part of the build.
> +  # FIXME: libclang depending on anything in clang-tools-extra seems like
> +  # a layering violation.
> +  if (true) {
> +    defines += [ "CLANG_TOOL_EXTRA_BUILD" ]
> +    deps += [
> +      "//clang-tools-extra/clang-include-fixer/plugin",
> +      "//clang-tools-extra/clang-tidy/plugin",
> +    ]
> +  }
> +
>    if (host_os == "win") {
> -    defines = [ "_CINDEX_LIB_" ]
> +    defines += [ "_CINDEX_LIB_" ]
>    }
>
>    sources = [
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits