[llvm-branch-commits] [llvm-branch] r367390 - Merging r367340 and r367341:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jul 31 00:42:31 2019
New Revision: 367390

URL: http://llvm.org/viewvc/llvm-project?rev=367390&view=rev
Log:
Merging r367340 and r367341:

(Minus the linuxkernel part, which is not present on the branch.)

------------------------------------------------------------------------
r367340 | nico | 2019-07-30 20:16:55 +0200 (Tue, 30 Jul 2019) | 6 lines

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
------------------------------------------------------------------------

------------------------------------------------------------------------
r367341 | nico | 2019-07-30 20:19:13 +0200 (Tue, 30 Jul 2019) | 1 line

gn build: Update comment I failed to update in r367340 / D65462
------------------------------------------------------------------------

Added:
    llvm/branches/release_90/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/
      - copied from r367340, llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/
Modified:
    llvm/branches/release_90/   (props changed)
    llvm/branches/release_90/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn
    llvm/branches/release_90/utils/gn/secondary/clang/tools/libclang/BUILD.gn

Propchange: llvm/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 31 00:42:31 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,366431,366481,366487,366527,366570,366925,367030,367062,367215,367314
+/llvm/trunk:155241,366431,366481,366487,366527,366570,366925,367030,367062,367215,367314,367340-367341

Modified: llvm/branches/release_90/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn?rev=367390&r1=367389&r2=367390&view=diff
==============================================================================
--- llvm/branches/release_90/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn (original)
+++ llvm/branches/release_90/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn Wed Jul 31 00:42:31 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" ]
@@ -16,6 +18,7 @@ static_library("plugin") {
     "//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/branches/release_90/utils/gn/secondary/clang/tools/libclang/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/utils/gn/secondary/clang/tools/libclang/BUILD.gn?rev=367390&r1=367389&r2=367390&view=diff
==============================================================================
--- llvm/branches/release_90/utils/gn/secondary/clang/tools/libclang/BUILD.gn (original)
+++ llvm/branches/release_90/utils/gn/secondary/clang/tools/libclang/BUILD.gn Wed Jul 31 00:42:31 2019
@@ -3,8 +3,6 @@ import("//llvm/version.gni")
 
 # This build file is just enough to get check-clang to pass, it's missing
 # several things from the CMake build:
-# - linking in clangTidyPlugin and clangIncludeFixerPlugin from
-#   clang-tools-extra (which doesn't have any GN build files yet)
 # - using libclang.exports
 # - a build target copying the Python bindings
 # - the GN linux build always builds without -fPIC (as if LLVM_ENABLE_PIC=OFF
@@ -39,8 +37,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 = [