Skip to content
This repository has been archived by the owner on Jan 25, 2024. It is now read-only.

Commit

Permalink
Unconditionally add ObjcProvider.umbrella_header files to compiler …
Browse files Browse the repository at this point in the history
…inputs, even when preferring explicit modules.

A small number of rules use `umbrella_header` to propagate an umbrella header for their module map that they don't propagate in any other header field. Since there is no `direct_*` version of this field, `swift_clang_module_aspect` can't easily extract the one umbrella header from the `depset` in the provider that may also include transitive umbrella headers.

PiperOrigin-RevId: 355667496
  • Loading branch information
allevato authored and swiple-rules-gardener committed Feb 4, 2021
1 parent d26868f commit bd8c7d4
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions swift/internal/compiling.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -858,8 +858,10 @@ def _collect_clang_module_inputs(

# Some rules still use the `umbrella_header` field to propagate a header
# that they don't also include in `CcInfo.compilation_context.headers`, so
# we also need to pull this in for the time being.
if not prefer_precompiled_modules and objc_info:
# we also need to pull these in for the time being.
# TODO(b/142867898): This can be removed once the Swift rules start
# generating its own module map for these targets.
if objc_info:
transitive_inputs.append(objc_info.umbrella_header)

for module in modules:
Expand Down

0 comments on commit bd8c7d4

Please sign in to comment.