Skip to content

fix(bootstrap): handle when runfiles env vars don't point to current binary's runfiles #3192

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 12 commits into from
Aug 24, 2025

Conversation

rickeylev
Copy link
Collaborator

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

@rickeylev rickeylev requested a review from aignas as a code owner August 18, 2025 07:57
@rickeylev rickeylev enabled auto-merge August 18, 2025 07:57
@rickeylev rickeylev disabled auto-merge August 18, 2025 08:18
@rickeylev rickeylev enabled auto-merge August 19, 2025 06:13
@rickeylev rickeylev added this pull request to the merge queue Aug 24, 2025
Merged via the queue into bazel-contrib:main with commit 06eaaa2 Aug 24, 2025
3 checks passed
@rickeylev rickeylev deleted the fix.bin.calls.bin branch August 24, 2025 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bootstrap_impl=script breaks subprocess.run
2 participants