Skip to content

Upstream: Only pass the strict Obj-C include paths from _direct_ dependencies to compilation actions #1516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luispadron merged 1 commit into from
May 18, 2025
Merged

Upstream: Only pass the strict Obj-C include paths from _direct_ dependencies to compilation actions #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion swift/internal/compiling.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,10 @@ def _precompile_clang_module(

prerequisites = struct(
bin_dir = feature_configuration._bin_dir,
cc_compilation_context = cc_compilation_context,
cc_compilation_context = compilation_context_for_explicit_module_compilation(
compilation_contexts = [cc_compilation_context],
swift_infos = swift_infos,
),
genfiles_dir = feature_configuration._genfiles_dir,
include_dev_srch_paths = False,
indexstore_directory = indexstore_directory,
Expand Down
16 changes: 0 additions & 16 deletions swift/toolchains/config/compile_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,29 +1486,13 @@ def _c_layering_check_configurator(prerequisites, args):
args.add("-Xcc", "-fmodules-strict-decluse")
return None

def _clang_module_strict_includes(module_context):
"""Returns the strict Clang include paths for a module context."""
if not module_context.clang:
return None
strict_includes = module_context.clang.strict_includes
if not strict_includes:
return None
return strict_includes.to_list()

def _clang_search_paths_configurator(prerequisites, args):
"""Adds Clang search paths to the command line."""
args.add_all(
prerequisites.cc_compilation_context.includes,
before_each = "-Xcc",
format_each = "-I%s",
)
args.add_all(
prerequisites.transitive_modules,
before_each = "-Xcc",
format_each = "-I%s",
map_each = _clang_module_strict_includes,
uniquify = True,
)

# Add Clang search paths for the workspace root and Bazel output roots. The
# first allows ClangImporter to find headers included using
Expand Down