Skip to content

fix(toolchain): Also set Make variables for local toolchains #3641

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

Draft
jwnimmer-tri wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Draft

fix(toolchain): Also set Make variables for local toolchains #3641

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ END_UNRELEASED_TEMPLATE

{#v0-0-0-fixed}
### Fixed
* Nothing fixed.
* (toolchain) Also set Make variables for local toolchains.

{#v0-0-0-added}
### Added
Expand Down
6 changes: 6 additions & 0 deletions python/current_py_toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,18 @@ def _current_py_toolchain_impl(ctx):
transitive.append(toolchain.py3_runtime.files)
vars["PYTHON3"] = toolchain.py3_runtime.interpreter.path
vars["PYTHON3_ROOTPATH"] = toolchain.py3_runtime.interpreter.short_path
elif toolchain.py3_runtime and toolchain.py3_runtime.interpreter_path:
vars["PYTHON3"] = toolchain.py3_runtime.interpreter_path
vars["PYTHON3_ROOTPATH"] = toolchain.py3_runtime.interpreter_path
Comment on lines +32 to +33
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Mar 1, 2026

Choose a reason for hiding this comment

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

medium

To improve readability and avoid redundant attribute access, you can store toolchain.py3_runtime.interpreter_path in a local variable.

Suggested change
vars["PYTHON3"] = toolchain.py3_runtime.interpreter_path
vars["PYTHON3_ROOTPATH"] = toolchain.py3_runtime.interpreter_path
path = toolchain.py3_runtime.interpreter_path
vars["PYTHON3"] = path
vars["PYTHON3_ROOTPATH"] = path


if toolchain.py2_runtime and toolchain.py2_runtime.interpreter:
direct.append(toolchain.py2_runtime.interpreter)
transitive.append(toolchain.py2_runtime.files)
vars["PYTHON2"] = toolchain.py2_runtime.interpreter.path
vars["PYTHON2_ROOTPATH"] = toolchain.py2_runtime.interpreter.short_path
elif toolchain.py2_runtime and toolchain.py2_runtime.interpreter_path:
vars["PYTHON2"] = toolchain.py2_runtime.interpreter_path
vars["PYTHON2_ROOTPATH"] = toolchain.py2_runtime.interpreter_path
Comment on lines +41 to +42
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Mar 1, 2026

Choose a reason for hiding this comment

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

medium

Similarly here, you can use a local variable to improve readability and avoid accessing the same attribute twice.

Suggested change
vars["PYTHON2"] = toolchain.py2_runtime.interpreter_path
vars["PYTHON2_ROOTPATH"] = toolchain.py2_runtime.interpreter_path
path = toolchain.py2_runtime.interpreter_path
vars["PYTHON2"] = path
vars["PYTHON2_ROOTPATH"] = path


files = depset(direct, transitive = transitive)
return [
Expand Down