Commit ac1beb0
build: use bin override if no python in PATH
On systems with no "python" in the PATH, e.g. FreeBSD, we should always
create a python symlink in get_bin_override().
PR-URL: #16241
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>1 parent d4b3b63 commit ac1beb0
1 file changed
Lines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1325,7 +1325,9 @@ def get_bin_override(): | |||
| 1325 | 1325 | # sys.executable. This directory will be prefixed to the PATH, so that | |
| 1326 | 1326 | # other tools that shell out to `python` will use the appropriate python | |
| 1327 | 1327 | ||
| 1328 | - if os.path.realpath(which('python')) == os.path.realpath(sys.executable): | ||
| 1328 | + which_python = which('python') | ||
| 1329 | + if (which_python and | ||
| 1330 | + os.path.realpath(which_python) == os.path.realpath(sys.executable)): | ||
| 1329 | 1331 | return | |
| 1330 | 1332 | ||
| 1331 | 1333 | bin_override = os.path.abspath('out/tools/bin') | |
0 commit comments