aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-12-12 15:29:31 +0000
committerDan Albert <danalbert@google.com>2015-01-08 14:44:29 -0800
commitb3f52a221c984c43ace0d08d5a8222e2ddf6b3bc (patch)
tree3f230281c7daf3ab36100b04fe20603326bd6e4d /configure
parentd3044d58027b3cb20c7d64acccca4722c58ccc78 (diff)
downloadexternal_llvm-b3f52a221c984c43ace0d08d5a8222e2ddf6b3bc.zip
external_llvm-b3f52a221c984c43ace0d08d5a8222e2ddf6b3bc.tar.gz
external_llvm-b3f52a221c984c43ace0d08d5a8222e2ddf6b3bc.tar.bz2
Require python 2.7.
We were already requiring 2.5, which meant that people on old linux distros had to upgrade anyway. Requiring python 2.6 will make supporting 3.X easier as we can use the 3.X exception syntax. According to the discussion on llvmdev, there is not much value is requiring just 2.6, we may as well just require 2.7. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224129 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 708bc15ff07dc2fcee3a66988bfc5bc15b80eb5f)
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure18
1 files changed, 9 insertions, 9 deletions
diff --git a/configure b/configure
index 4bfc2e5..b8cb1e2 100755
--- a/configure
+++ b/configure
@@ -8159,8 +8159,8 @@ else
echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;}
fi
- # Extract the first word of "python python2 python26", so it can be a program name with args.
-set dummy python python2 python26; ac_word=$2
+ # Extract the first word of "python python2 python27", so it can be a program name with args.
+set dummy python python2 python27; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PYTHON+set}" = set; then
@@ -8188,8 +8188,8 @@ IFS=$as_save_IFS
test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
- { { echo "$as_me:$LINENO: error: could not find python 2.5 or higher" >&5
-echo "$as_me: error: could not find python 2.5 or higher" >&2;}
+ { { echo "$as_me:$LINENO: error: could not find python 2.7 or higher" >&5
+echo "$as_me: error: could not find python 2.7 or higher" >&2;}
{ (exit 1); exit 1; }; }"
;;
esac
@@ -8206,23 +8206,23 @@ fi
fi
-{ echo "$as_me:$LINENO: checking for python >= 2.5" >&5
-echo $ECHO_N "checking for python >= 2.5... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for python >= 2.7" >&5
+echo $ECHO_N "checking for python >= 2.7... $ECHO_C" >&6; }
ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
if test "$ac_python_version_major" -gt "2" || \
(test "$ac_python_version_major" -eq "2" && \
- test "$ac_python_version_minor" -ge "5") ; then
+ test "$ac_python_version_minor" -ge "7") ; then
{ echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5
echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; }
else
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
- { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.5
+ { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.7
See \`config.log' for more details." >&5
-echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.5
+echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.7
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi