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

Don't override NUM_JOBS if already set #3258

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't override NUM_JOBS if already set #3258

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
5 changes: 4 additions & 1 deletion cargo/private/cargo_build_script.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,13 +365,16 @@ def _cargo_build_script_impl(ctx):
"CARGO_MANIFEST_DIR": manifest_dir,
"CARGO_PKG_NAME": pkg_name,
"HOST": toolchain.exec_triple.str,
"NUM_JOBS": "1",
"OPT_LEVEL": compilation_mode_opt_level,
"RUSTC": toolchain.rustc.path,
"TARGET": toolchain.target_flag_value,
# OUT_DIR is set by the runner itself, rather than on the action.
})

# Allow the user to override the number of jobs for the build script.
if "NUM_JOBS" not in env:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is any value larger than 1 then it would be good to have an associated resource set

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what that means, what's an "associated resource"?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically a change similar to #3112

which uses ctx.actions.run.resource_set

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll find the big ugly file rust/private/rustc_resource_set.bzl and it's use in rust/private/rustc.bzl

resource_set = get_rustc_resource_set(toolchain)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@UebelAndre I can't call get_rustc_resource_set as it stands without refactoring it to take an int instead of a toolchain, do you want me to do that, or duplicate rust/private/rustc_resource_set.bzl with an int variant?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could just add a new function. get_cargo_build_script_resource_set or something that does what you need. When I wrote that all I was thinking about was Rustc actions but I don't think we should duplicate these functions. So I'd just make a new function for the use here.

env["NUM_JOBS"] = 1

# This isn't exactly right, but Bazel doesn't have exact views of "debug" and "release", so...
env.update({
"DEBUG": {"dbg": "true", "fastbuild": "true", "opt": "false"}.get(ctx.var["COMPILATION_MODE"], "true"),
Expand Down