Skip to content

Commit

Permalink
Fix symbol graph extraction when using explicit module maps or VFS ov…
Browse files Browse the repository at this point in the history
…erlays (#1246)

Signed-off-by: Brentley Jones <github@brentleyjones.com>
  • Loading branch information
brentleyjones authored Jun 21, 2024
1 parent c6248e4 commit ebcfdf3
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions swift/toolchains/config/compile_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ def compile_action_configs(
),
]

#### Search paths for Swift module dependencies
#### Search paths/explicit module map for Swift module dependencies
action_configs.extend([
ActionConfigInfo(
actions = [
Expand Down Expand Up @@ -795,7 +795,6 @@ def compile_action_configs(
SWIFT_ACTION_COMPILE_MODULE_INTERFACE,
SWIFT_ACTION_DERIVE_FILES,
SWIFT_ACTION_DUMP_AST,
SWIFT_ACTION_SYMBOL_GRAPH_EXTRACT,
],
configurators = [_dependencies_swiftmodules_configurator],
not_features = [
Expand Down Expand Up @@ -840,6 +839,13 @@ def compile_action_configs(
configurators = [_macro_expansion_configurator],
features = [SWIFT_FEATURE__SUPPORTS_MACROS],
),

# swift-symbolgraph-extract doesn't yet support explicit Swift module
# maps.
ActionConfigInfo(
actions = [SWIFT_ACTION_SYMBOL_GRAPH_EXTRACT],
configurators = [_dependencies_swiftmodules_configurator],
),
])

#### Search paths for framework dependencies
Expand Down

0 comments on commit ebcfdf3

Please sign in to comment.