Skip to content
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

Add toolchain parameter to the affected actions #2140

Merged
merged 4 commits into from
Oct 4, 2023
Merged

Add toolchain parameter to the affected actions #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ff2016
Add toolchains
kotlaja Aug 29, 2023
32f3067
Update toolchains
kotlaja Sep 11, 2023
f0005b9
Merge branch 'main' into aegs
kotlaja Sep 14, 2023
c763c8e
Merge branch 'main' into aegs
kotlaja Oct 4, 2023
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 cargo/private/cargo_build_script.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ def _cargo_build_script_impl(ctx):
mnemonic = "CargoBuildScriptRun",
progress_message = "Running Cargo build script {}".format(pkg_name),
env = env,
toolchain = None,
)

return [
Expand Down
1 change: 1 addition & 0 deletions rust/private/clippy.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ See https://github.com/bazelbuild/rules_rust/pull/1264#discussion_r853241339 for
tools = [toolchain.clippy_driver],
arguments = args.all,
mnemonic = "Clippy",
toolchain = "@rules_rust//rust:toolchain_type",
)

return [
Expand Down
3 changes: 3 additions & 0 deletions rust/private/rustc.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ def rustc_compile_action(
formatted_version,
len(crate_info.srcs.to_list()),
),
toolchain = "@rules_rust//rust:toolchain_type",
)
if args_metadata:
ctx.actions.run(
Expand All @@ -1283,6 +1284,7 @@ def rustc_compile_action(
formatted_version,
len(crate_info.srcs.to_list()),
),
toolchain = "@rules_rust//rust:toolchain_type",
)
else:
# Run without process_wrapper
Expand All @@ -1301,6 +1303,7 @@ def rustc_compile_action(
formatted_version,
len(crate_info.srcs.to_list()),
),
toolchain = "@rules_rust//rust:toolchain_type",
)

if experimental_use_cc_common_link:
Expand Down
Loading