about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <andersrb@gmail.com>2012-06-25 17:54:52 -0700
committerBrian Anderson <andersrb@gmail.com>2012-06-25 17:54:52 -0700
commitc904927f73d0bf1e0775aadfdc9dc6ae65b869c4 (patch)
tree1242fdddc5738f0c798c279214d282c10265e3cb
parentc2751c5640c9400c58de494e0ff8a49e0c1de5d2 (diff)
parent6322eda35ca0e5d05247eccfa820f0aa730591ce (diff)
downloadrust-c904927f73d0bf1e0775aadfdc9dc6ae65b869c4.tar.gz
rust-c904927f73d0bf1e0775aadfdc9dc6ae65b869c4.zip
Merge pull request #2722 from bstrie/py2
Fail to configure without an LLVM-friendly Python
-rwxr-xr-xconfigure7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index f77c726a581..1bcbe513579 100755
--- a/configure
+++ b/configure
@@ -311,8 +311,13 @@ fi
 step_msg "looking for build programs"
 
 probe_need CFG_PERL        perl
-probe_need CFG_PYTHON      python python2.6 python2 python3
 probe_need CFG_CURL        curl
+probe_need CFG_PYTHON      python2.7 python2.6 python2 python
+
+python_version=$($CFG_PYTHON -V 2>&1)
+if [ $(echo $python_version | grep -c '^Python 2\.[4567]') -ne 1 ]; then
+    err "Found $python_version, but LLVM requires Python 2.4-2.7"
+fi
 
 # If we have no git directory then we are probably a tarball distribution
 # and shouldn't attempt to load submodules