fix(bootstrap): handle when runfiles env vars don't point to current binary's runfiles#3192
Merged
rickeylev merged 12 commits intobazel-contrib:mainfrom Aug 24, 2025
Merged
Conversation
8d86ecb to
b7122ce
Compare
aignas
approved these changes
Aug 18, 2025
…into fix.bin.calls.bin
…into fix.bin.calls.bin
…into fix.bin.calls.bin
Contributor
|
@rickeylev is there a plan to turn on |
Collaborator
Author
|
Eventually, yes. IIRC, the main blocker is Bazel 8+ is required for rules_pkg to be able to process py_binary correctly. #2521 is the tracking issue |
Contributor
|
@rickeylev do you think the default could vary based on the Bazel version? Or maybe https://github.com/bazel-contrib/bazelrc-preset.bzl should set it? |
Collaborator
|
We technically can set a different default and it may be a good idea, that said, I wonder if we should wait for the packaging rules to properly support symlinks before we do the flip. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The stage1 bootstrap script had a bug in the find_runfiles_root
function where it would unconditionally use the RUNFILES_DIR et al
environment variables if they were set.
This failed in a particular nested context: an outer binary
calling an inner binary when the inner binary isn't a data
dependency of the outer binary (i.e. the outer doesn't contain
the inner in runfiles). This would cause the inner binary to
incorrectly resolve its runfiles, leading to failures. Such
a case can occur if a genrule calls the outer binary, which has
the inner binary passed as an arg.
This change adds a check to validate that the script's entry point
exists within the inherited RUNFILES_DIR before using it. If the
entry point is not found, it proceeds with other runfiles discovery
methods. This matches the system_python runfiles discovery logic.
Fixes #3187