57004738b1
Since the 0.21 upgrade, the host `$PATH` is not forwarded anymore by default to the sandboxes in charge to realize Bazel actions. This default change broke the `py_binary` rule among other things. Every python binary is wrapped in a stub in charge to setup the execution environment. Currently, this stub's shebang points to a `/usr/bin/env python` which cannot be resolved with the current `$PATH`. This results in breaking any build pipeline requiring the use of python at some point. On top of the incorrect shebang, the stub template is unable to find the actual python binary using `SearchPath`. This PR fixes those two things by re-writing the stub template shebang to the actual python binary and by substituting the faulty default python binary lookup to the right one.
13 lines
766 B
Diff
13 lines
766 B
Diff
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
|
|
index dac21c9a83..69b11c283f 100644
|
|
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
|
|
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
|
|
@@ -67,7 +67,7 @@ def FindPythonBinary(module_space):
|
|
return os.path.join(module_space, PYTHON_BINARY)
|
|
else:
|
|
# Case 4: Path has to be looked up in the search path.
|
|
- return SearchPath(PYTHON_BINARY)
|
|
+ return "NIX_STORE_PYTHON_PATH"
|
|
|
|
def CreatePythonPathEntries(python_imports, module_space):
|
|
parts = python_imports.split(':');
|