diff options
author | Ben Gamari <ben@smart-cactus.org> | 2021-07-28 12:22:31 -0400 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2021-07-28 12:32:22 -0400 |
commit | a08a70808e238a0ce663402f27f7992b09512a80 (patch) | |
tree | c4f7e9e42751962eebdc45f6788b19ad8cf71e60 | |
parent | 10678945c1d3261273a1d7a389d14a69f4e28567 (diff) | |
download | haskell-wip/fix-validate.tar.gz |
validate: Look for python3 executable in python detectionwip/fix-validate
Previously we would only look for a `python` executable, but in general
we should prefer `python3` and sometimes `python` doesn't exist.
-rwxr-xr-x | validate | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -378,11 +378,13 @@ fi # We need to be quite picky on Windows about which Python interpreter we use # (#12554, #12661). Allow the user to override it. -if [ "z$PYTHON" != "z" ]; then - PYTHON_ARG="PYTHONPATH=$PYTHON" -else - PYTHON_ARG="PYTHONPATH=$(which python)" +if [ "z$PYTHON" == "z" ]; then + PYTHON="$(which python3)" +fi +if [ "z$PYTHON" == "z" ]; then + PYTHON="$(which python)" fi +PYTHON_ARG="PYTHONPATH=$PYTHON" if [ "$ignore_perf_all" = "YES" ]; then test_perf_args="runtest.opts +=--ignore-perf-failures=all" |