Skip to content
Open
Changes from all commits
Commits
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
23 changes: 19 additions & 4 deletions rust/private/rust.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1006,9 +1006,24 @@ rust_library = rule(
"""),
)

def _resolve_platform(settings, attr):
"""Resolve the platform label for a transition, adding @ prefix if needed.

With --noincompatible_unambiguous_label_stringification, str(label) for
main-repo labels omits the leading @, producing "//foo:bar" instead of
"@//foo:bar". The platform setting requires the canonical form with @.
See https://github.com/bazelbuild/bazel/issues/15916.
"""
if not attr.platform:
return settings["//command_line_option:platforms"]
platform = str(attr.platform)
if not platform.startswith("@"):
platform = "@" + platform
return platform

def _rust_static_library_transition_impl(settings, attr):
return {
"//command_line_option:platforms": str(attr.platform) if attr.platform else settings["//command_line_option:platforms"],
"//command_line_option:platforms": _resolve_platform(settings, attr),
}

_rust_static_library_transition = transition(
Expand Down Expand Up @@ -1049,7 +1064,7 @@ rust_static_library = rule(

def _rust_shared_library_transition_impl(settings, attr):
return {
"//command_line_option:platforms": str(attr.platform) if attr.platform else settings["//command_line_option:platforms"],
"//command_line_option:platforms": _resolve_platform(settings, attr),
}

_rust_shared_library_transition = transition(
Expand Down Expand Up @@ -1171,7 +1186,7 @@ _RUST_BINARY_ATTRS = {

def _rust_binary_transition_impl(settings, attr):
return {
"//command_line_option:platforms": str(attr.platform) if attr.platform else settings["//command_line_option:platforms"],
"//command_line_option:platforms": _resolve_platform(settings, attr),
}

_rust_binary_transition = transition(
Expand Down Expand Up @@ -1418,7 +1433,7 @@ rust_test_without_process_wrapper_test = rule(

def _rust_test_transition_impl(settings, attr):
return {
"//command_line_option:platforms": str(attr.platform) if attr.platform else settings["//command_line_option:platforms"],
"//command_line_option:platforms": _resolve_platform(settings, attr),
}

_rust_test_transition = transition(
Expand Down
Loading