Skip to content

Look up CARGO_BAZEL_GENERATOR_PATH correctly #2088

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.

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

Merged
merged 1 commit into from
Dec 29, 2024
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Francois-Rene Rideau <[email protected]>
Julio Merino <[email protected]>
Kamal Marhubi <[email protected]>
Kristina Chodorow <[email protected]>
Michael Hackner <[email protected]>
Philipp Wollermann <[email protected]>
Ulf Adams <[email protected]>
Justine Alexandra Roberts Tunney <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions crate_universe/private/crates_vendor.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ def _crates_vendor_impl(ctx):
cargo_bazel_runfiles = []

# Allow action envs to override the use of the cargo-bazel target.
if CARGO_BAZEL_GENERATOR_PATH in ctx.var:
bin_path = ctx.var[CARGO_BAZEL_GENERATOR_PATH]
if CARGO_BAZEL_GENERATOR_PATH in ctx.configuration.default_shell_env:
bin_path = ctx.configuration.default_shell_env[CARGO_BAZEL_GENERATOR_PATH]
elif ctx.executable.cargo_bazel:
bin_path = _runfiles_path(ctx.executable.cargo_bazel, is_windows)
cargo_bazel_runfiles.append(ctx.executable.cargo_bazel)
Expand Down
Loading