Skip to content

Bring strip_level configuration up to top level #3434

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bring strip_level configuration up to top level #3434

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
6 changes: 5 additions & 1 deletion rust/private/repository_utils.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ rust_toolchain(
extra_rustc_flags = {extra_rustc_flags},
extra_exec_rustc_flags = {extra_exec_rustc_flags},
opt_level = {opt_level},
strip_level = {strip_level},
tags = ["rust_version={version}"],
)
"""
Expand All @@ -286,7 +287,8 @@ def BUILD_for_rust_toolchain(
stdlib_linkflags = None,
extra_rustc_flags = None,
extra_exec_rustc_flags = None,
opt_level = None):
opt_level = None,
strip_level = None):
"""Emits a toolchain declaration to match an existing compiler and stdlib.

Args:
Expand All @@ -307,6 +309,7 @@ def BUILD_for_rust_toolchain(
extra_rustc_flags (list, optional): Extra flags to pass to rustc in non-exec configuration.
extra_exec_rustc_flags (list, optional): Extra flags to pass to rustc in exec configuration.
opt_level (dict, optional): Optimization level config for this toolchain.
strip_level (dict, optional): Strip level config for this toolchain.

Returns:
str: A rendered template of a `rust_toolchain` declaration
Expand Down Expand Up @@ -346,6 +349,7 @@ def BUILD_for_rust_toolchain(
extra_rustc_flags = extra_rustc_flags,
extra_exec_rustc_flags = extra_exec_rustc_flags,
opt_level = opt_level,
strip_level = strip_level,
version = version,
)

Expand Down
13 changes: 13 additions & 0 deletions rust/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ def rust_register_toolchains(
extra_target_triples = DEFAULT_EXTRA_TARGET_TRIPLES,
extra_rustc_flags = None,
extra_exec_rustc_flags = None,
strip_level = None,
urls = DEFAULT_STATIC_RUST_URL_TEMPLATES,
versions = _RUST_TOOLCHAIN_VERSIONS,
aliases = {},
Expand Down Expand Up @@ -190,6 +191,7 @@ def rust_register_toolchains(
extra_target_triples (list, optional): Additional rust-style targets that rust toolchains should support.
extra_rustc_flags (dict, list, optional): Dictionary of target triples to list of extra flags to pass to rustc in non-exec configuration.
extra_exec_rustc_flags (list, optional): Extra flags to pass to rustc in exec configuration.
strip_level (dict, dict, optional): Dictionary of target triples to strip config.
urls (list, optional): A list of mirror urls containing the tools from the Rust-lang static file server. These must contain the '{}' used to substitute the tool being fetched (using .format).
versions (list, optional): A list of toolchain versions to download. This parameter only accepts one versions
per channel. E.g. `["1.65.0", "nightly/2022-11-02", "beta/2020-12-30"]`.
Expand Down Expand Up @@ -267,6 +269,7 @@ def rust_register_toolchains(
rustfmt_version = rustfmt_version,
extra_rustc_flags = extra_rustc_flags,
extra_exec_rustc_flags = extra_exec_rustc_flags,
strip_level = strip_level,
sha256s = sha256s,
urls = urls,
versions = versions,
Expand Down Expand Up @@ -393,6 +396,9 @@ _RUST_TOOLCHAIN_REPOSITORY_ATTRS = {
"opt_level": attr.string_dict(
doc = "Rustc optimization levels. For more details see the documentation for `rust_toolchain.opt_level`.",
),
"strip_level": attr.string_dict(
doc = "Rustc strip levels. For more details see the documentation for `rust_toolchain.strip_level`.",
),
"rustfmt_version": attr.string(
doc = "The version of the tool among \"nightly\", \"beta\", or an exact version.",
),
Expand Down Expand Up @@ -513,6 +519,7 @@ def _rust_toolchain_tools_repository_impl(ctx):
extra_rustc_flags = ctx.attr.extra_rustc_flags,
extra_exec_rustc_flags = ctx.attr.extra_exec_rustc_flags,
opt_level = ctx.attr.opt_level if ctx.attr.opt_level else None,
strip_level = ctx.attr.strip_level if ctx.attr.strip_level else None,
version = ctx.attr.version,
))

Expand Down Expand Up @@ -617,6 +624,7 @@ def rust_toolchain_repository(
extra_rustc_flags = None,
extra_exec_rustc_flags = None,
opt_level = None,
strip_level = None,
sha256s = None,
urls = DEFAULT_STATIC_RUST_URL_TEMPLATES,
auth = None,
Expand Down Expand Up @@ -644,6 +652,7 @@ def rust_toolchain_repository(
extra_rustc_flags (list, optional): Extra flags to pass to rustc in non-exec configuration.
extra_exec_rustc_flags (list, optional): Extra flags to pass to rustc in exec configuration.
opt_level (dict, optional): Optimization level config for this toolchain.
strip_level (dict, optional): Strip level config for this toolchain.
sha256s (str, optional): A dict associating tool subdirectories to sha256 hashes. See
[rust_register_toolchains](#rust_register_toolchains) for more details.
urls (list, optional): A list of mirror urls containing the tools from the Rust-lang static file server. These must contain the '{}' used to substitute the tool being fetched (using .format). Defaults to ['https://static.rust-lang.org/dist/{}.tar.xz']
Expand Down Expand Up @@ -676,6 +685,7 @@ def rust_toolchain_repository(
extra_rustc_flags = extra_rustc_flags,
extra_exec_rustc_flags = extra_exec_rustc_flags,
opt_level = opt_level,
strip_level = strip_level,
sha256s = sha256s,
urls = urls,
auth = auth,
Expand Down Expand Up @@ -1118,6 +1128,7 @@ def rust_repository_set(
extra_rustc_flags = None,
extra_exec_rustc_flags = None,
opt_level = None,
strip_level = None,
sha256s = None,
urls = DEFAULT_STATIC_RUST_URL_TEMPLATES,
auth = None,
Expand Down Expand Up @@ -1151,6 +1162,7 @@ def rust_repository_set(
extra_rustc_flags (dict, list, optional): Dictionary of target triples to list of extra flags to pass to rustc in non-exec configuration.
extra_exec_rustc_flags (list, optional): Extra flags to pass to rustc in exec configuration.
opt_level (dict, dict, optional): Dictionary of target triples to optimiztion config.
strip_level (dict, dict, optional): Dictionary of target triples to strip config.
sha256s (str, optional): A dict associating tool subdirectories to sha256 hashes. See
[rust_register_toolchains](#rust_register_toolchains) for more details.
urls (list, optional): A list of mirror urls containing the tools from the Rust-lang static file server. These
Expand Down Expand Up @@ -1206,6 +1218,7 @@ def rust_repository_set(
extra_exec_rustc_flags = extra_exec_rustc_flags,
extra_rustc_flags = toolchain_extra_rustc_flags,
opt_level = opt_level.get(toolchain.target_triple) if opt_level != None else None,
strip_level = strip_level.get(toolchain.target_triple) if strip_level != None else None,
target_settings = target_settings,
rustfmt_version = rustfmt_version,
sha256s = sha256s,
Expand Down