Merge branch 'dd/ci-musl-libc' into HEAD

[thirdparty/git.git] / ci / lib.sh

diff --git a/ci/lib.sh b/ci/lib.sh
index e9a5c51425a25a533633f96147aea5cdab952f3d..87cd29bab691be1d8ad662c5f7952f93133c277c 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -162,6 +162,9 @@ linux-clang|linux-gcc)
        if [ "$jobname" = linux-gcc ]
        then
                export CC=gcc-8
+               MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
+       else
+               MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
        fi
 
        export GIT_TEST_HTTPD=true
@@ -182,6 +185,9 @@ osx-clang|osx-gcc)
        if [ "$jobname" = osx-gcc ]
        then
                export CC=gcc-9
+               MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
+       else
+               MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
        fi
 
        # t9810 occasionally fails on Travis CI OS X