Skip to content

Fix C++20 modules compilation failing during analysis #775

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

Closed
fmeum wants to merge 1 commit into from
+13 −1
Closed

Fix C++20 modules compilation failing during analysis #775

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
14 changes: 13 additions & 1 deletion cc/private/compile/compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ def _create_scan_deps_action(
compile_build_variables = compile_variables,
action_name = ACTION_NAMES.cpp_module_deps_scanning,
toolchain_type = _starlark_cc_semantics.toolchain,
needs_include_validation = _starlark_cc_semantics.needs_include_validation(language),
progress_message_prefix = progress_message_prefix,
)

Expand Down Expand Up @@ -2319,11 +2320,22 @@ def _create_compile_action(
progress_message_prefix = None,
source = None,
toolchain_type = None,
use_pic = False):
use_pic = False,
additional_outputs = [],
module_files = None,
modmap_file = None,
modmap_input_file = None):
# TODO(bgorshenev): use bazel_features checks
version_dependent_kwargs = {}
if progress_message_prefix:
version_dependent_kwargs["progress_message_prefix"] = progress_message_prefix
if additional_outputs:
version_dependent_kwargs["additional_outputs"] = additional_outputs
if modmap_file:
version_dependent_kwargs["module_files"] = module_files
version_dependent_kwargs["modmap_file"] = modmap_file
version_dependent_kwargs["modmap_input_file"] = modmap_input_file

return _cc_internal.create_cc_compile_action(
action_construction_context = action_construction_context,
action_name = action_name,
Expand Down