From 1458336d19da72163243c065d6732bb2876ec09c Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 8 Aug 2018 12:34:15 -0400 Subject: [PATCH] Support building with python3 on unix The windows build scripts try finding python in order of python3, python2 and then python. The unix build scripts dont. They just try python2 variants and then fail. This change makes brings them closer together by letting users build using only python3. --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 4002f2744c24..c0da6d110512 100755 --- a/build.sh +++ b/build.sh @@ -7,9 +7,9 @@ export ghprbCommentBody= # resolve python-version to use if [ "$PYTHON" == "" ] ; then - if ! PYTHON=$(command -v python2.7 || command -v python2 || command -v python) + if ! PYTHON=$(command -v python3 || command -v python2 || command -v python) then - echo "Unable to locate build-dependency python2.x!" 1>&2 + echo "Unable to locate build-dependency python!" 1>&2 exit 1 fi fi @@ -18,7 +18,7 @@ fi # useful in case of explicitly set option. if ! command -v $PYTHON > /dev/null then - echo "Unable to locate build-dependency python2.x ($PYTHON)!" 1>&2 + echo "Unable to locate build-dependency python ($PYTHON)!" 1>&2 exit 1 fi