fixed external includes handling

bazelbuild · Oct 25, 2024 · 4389e34 · 4389e34
1 parent 3d7e126
commit 4389e34
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/aspect/intellij_info_impl.bzl b/aspect/intellij_info_impl.bzl
@@ -523,6 +523,9 @@ def collect_cpp_info(target, ctx, semantics, ide_info, ide_info_file, output_gro
                 [compilation_context] + [impl[CcInfo].compilation_context for impl in implementation_deps],
         )
 
+    # external_includes available since bazel 7
+    external_includes = getattr(compilation_context, "external_includes", depset()).to_list()
+
     c_info = struct_omit_none(
         header = headers,
         source = sources,
@@ -531,7 +534,8 @@ def collect_cpp_info(target, ctx, semantics, ide_info, ide_info_file, output_gro
         transitive_define = compilation_context.defines.to_list(),
         transitive_include_directory = compilation_context.includes.to_list(),
         transitive_quote_include_directory = compilation_context.quote_includes.to_list(),
-        transitive_system_include_directory = compilation_context.system_includes.to_list(),
+        # both system and external includes are add using `-isystem`
+        transitive_system_include_directory = compilation_context.system_includes.to_list() + external_includes,
         include_prefix = getattr(ctx.rule.attr, "include_prefix", None),
         strip_include_prefix = getattr(ctx.rule.attr, "strip_include_prefix", None),
     )