Add implementation_deps compilation_contexts.

erenon · Oct 3, 2024 · 6989818 · 6989818
1 parent cd2c6ef
commit 6989818
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/clang_tidy/clang_tidy.bzl b/clang_tidy/clang_tidy.bzl
@@ -8,7 +8,7 @@ def _run_tidy(
         additional_deps,
         config,
         flags,
-        compilation_context,
+        compilation_contexts,
         infile,
         discriminator):
     inputs = depset(
@@ -17,7 +17,7 @@ def _run_tidy(
             additional_deps.files.to_list() +
             ([exe.files_to_run.executable] if exe.files_to_run.executable else [])
         ),
-        transitive = [compilation_context.headers],
+        transitive = [compilation_context.headers for compilation_context in compilation_contexts],
     )
 
     args = ctx.actions.args()
@@ -48,23 +48,24 @@ def _run_tidy(
     # add args specified by the toolchain, on the command line and rule copts
     args.add_all(flags)
 
-    # add defines
-    for define in compilation_context.defines.to_list():
-        args.add("-D" + define)
+    for compilation_context in compilation_contexts:
+        # add defines
+        for define in compilation_context.defines.to_list():
+            args.add("-D" + define)
 
-    for define in compilation_context.local_defines.to_list():
-        args.add("-D" + define)
+        for define in compilation_context.local_defines.to_list():
+            args.add("-D" + define)
 
-    # add includes
-    for i in compilation_context.framework_includes.to_list():
-        args.add("-F" + i)
+        # add includes
+        for i in compilation_context.framework_includes.to_list():
+            args.add("-F" + i)
 
-    for i in compilation_context.includes.to_list():
-        args.add("-I" + i)
+        for i in compilation_context.includes.to_list():
+            args.add("-I" + i)
 
-    args.add_all(compilation_context.quote_includes.to_list(), before_each = "-iquote")
+        args.add_all(compilation_context.quote_includes.to_list(), before_each = "-iquote")
 
-    args.add_all(compilation_context.system_includes.to_list(), before_each = "-isystem")
+        args.add_all(compilation_context.system_includes.to_list(), before_each = "-isystem")
 
     args.add_all(compilation_context.external_includes.to_list(), before_each = "-isystem")
 
@@ -153,7 +154,10 @@ def _clang_tidy_aspect_impl(target, ctx):
     exe = ctx.attr._clang_tidy_executable
     additional_deps = ctx.attr._clang_tidy_additional_deps
     config = ctx.attr._clang_tidy_config.files.to_list()[0]
-    compilation_context = target[CcInfo].compilation_context
+
+    compilation_contexts = [target[CcInfo].compilation_context]
+    if hasattr(ctx.rule.attr, "implementation_deps"):
+        compilation_contexts.extend([implementation_dep[CcInfo].compilation_context for implementation_dep in ctx.rule.attr.implementation_deps])
 
     rule_flags = ctx.rule.attr.copts if hasattr(ctx.rule.attr, "copts") else []
     c_flags = _safe_flags(_toolchain_flags(ctx, ACTION_NAMES.c_compile) + rule_flags) + ["-xc"]
@@ -169,7 +173,7 @@ def _clang_tidy_aspect_impl(target, ctx):
             additional_deps,
             config,
             c_flags if src.extension == "c" else cxx_flags,
-            compilation_context,
+            compilation_contexts,
             src,
             target.label.name,
         )
@@ -183,6 +187,7 @@ def _clang_tidy_aspect_impl(target, ctx):
 clang_tidy_aspect = aspect(
     implementation = _clang_tidy_aspect_impl,
     fragments = ["cpp"],
+    attr_aspects = ["implementation_deps"],
     attrs = {
         "_cc_toolchain": attr.label(default = Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
         "_clang_tidy_wrapper": attr.label(default = Label("//clang_tidy:clang_tidy")),