diff --git a/CHANGELOG.md b/CHANGELOG.md
index c172b148ec..728b5f5ec0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/python/current_py_toolchain.bzl b/python/current_py_toolchain.bzl
index 0ca5c90ccc..4fb9eb9eed 100644
--- a/python/current_py_toolchain.bzl
+++ b/python/current_py_toolchain.bzl
@@ -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
 
     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
 
     files = depset(direct, transitive = transitive)
     return [