Skip to content

Automatically add supports-path-mapping where applicable #803

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

Open
keith wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Automatically add supports-path-mapping where applicable #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f86c29
Automatically add supports-path-mapping where applicable
keith Jul 27, 2026
1b3cc7e
gate
keith Jul 27, 2026
fe44f05
feature
keith Jul 27, 2026
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
1 change: 1 addition & 0 deletions cc/private/compile/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ bzl_library(
"//cc/common:semantics_bzl",
"//cc/private:cc_internal_bzl",
"//cc/private/rules_impl:native_cc_common_bzl",
"@bazel_features//:features",
"@bazel_skylib//lib:paths",
],
)
Expand Down
13 changes: 12 additions & 1 deletion cc/private/compile/cc_compilation_helper.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.
"""Compilation helper for C++ rules."""

load("@bazel_features//:features.bzl", "bazel_features")
load("@bazel_skylib//lib:paths.bzl", "paths")
load(
"//cc/common:cc_helper_internal.bzl",
Expand Down Expand Up @@ -402,7 +403,17 @@ def _create_module_map_action(
tree_artifacts += [h for h in textual_headers if h.is_directory]
content.add_all(tree_artifacts, map_each = lambda x: None, allow_closure = True)

actions.write(module_map.file, content = content, is_executable = True, mnemonic = "CppModuleMap")
write_kwargs = {}
if bazel_features.rules.write_action_has_execution_requirements:
write_kwargs["execution_requirements"] = {"supports-path-mapping": ""}

actions.write(
module_map.file,
content = content,
is_executable = True,
mnemonic = "CppModuleMap",
**write_kwargs
)

def _init_cc_compilation_context(
# DO NOT use ctx, this is a temporary placeholder
Expand Down
3 changes: 3 additions & 0 deletions cc/private/link/finalize_link_action.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,9 @@ def _create_action(
for req in _cc_common_internal.get_execution_requirements(feature_configuration = feature_configuration, action_name = action_name):
execution_info[req] = ""

if mnemonic == "CppArchive":
execution_info["supports-path-mapping"] = ""

# At the moment we do not believe that LTO builds are sufficiently cacheable or sufficiently
# frequent to invest time in path mapping.
# CppLink does significantly different work for LTO and non-LTO builds and there is an argument
Expand Down
1 change: 1 addition & 0 deletions tests/cc/common/cc_library_configured_target_tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def _test_cc_library_data_in_runfiles(name, **kwargs):
name = name,
impl = _test_cc_library_data_in_runfiles_impl,
target = name + "_lib_with_data",
test_features = ["module_maps"],
**kwargs
)

Expand Down