diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-10-12 08:42:59 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-10-12 08:42:59 +0000 |
| commit | d36e6444aa6ce155dcb8479609cc12c81c5fa166 (patch) | |
| tree | d88ce7b389275ebde0bbbf9a0883c544cc44dff0 | |
| parent | 017d8a3e23b719ece59f2498582db7f25d65c1b9 (diff) | |
| download | llvm-d36e6444aa6ce155dcb8479609cc12c81c5fa166.tar.gz llvm-d36e6444aa6ce155dcb8479609cc12c81c5fa166.tar.bz2 llvm-d36e6444aa6ce155dcb8479609cc12c81c5fa166.tar.xz | |
Update so that it uses the `-V' command line option and supports Python 3.x.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192527 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/configure.ac | 7 | ||||
| -rwxr-xr-x | configure | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 85eee54bf3..d5f95cd0eb 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1377,12 +1377,13 @@ else fi AC_MSG_CHECKING([for python >= 2.5]) -ac_python_version=`$PYTHON -c 'import sys; print sys.version.split()[[0]]'` +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" -eq "2" \ - && test "$ac_python_version_minor" -ge "5" ; then +if test "$ac_python_version_major" -gt "2" || \ + (test "$ac_python_version_major" -eq "2" && \ + test "$ac_python_version_minor" -ge "5") ; then AC_MSG_RESULT([$PYTHON ($ac_python_version)]) else AC_MSG_RESULT([not found]) @@ -11815,12 +11815,13 @@ fi { echo "$as_me:$LINENO: checking for python >= 2.5" >&5 echo $ECHO_N "checking for python >= 2.5... $ECHO_C" >&6; } -ac_python_version=`$PYTHON -c 'import sys; print sys.version.split()[0]'` +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" -eq "2" \ - && test "$ac_python_version_minor" -ge "5" ; then +if test "$ac_python_version_major" -gt "2" || \ + (test "$ac_python_version_major" -eq "2" && \ + test "$ac_python_version_minor" -ge "5") ; then { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5 echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; } else |