]> git.lizzy.rs Git - rust.git/commitdiff
Merge pull request #2722 from bstrie/py2
authorBrian Anderson <andersrb@gmail.com>
Tue, 26 Jun 2012 00:54:52 +0000 (17:54 -0700)
committerBrian Anderson <andersrb@gmail.com>
Tue, 26 Jun 2012 00:54:52 +0000 (17:54 -0700)
Fail to configure without an LLVM-friendly Python

configure

index f77c726a581bf97447c7c8f8c6a116ad85c7b971..1bcbe5135791a161584c87f85a6c1f6f408c793f 100755 (executable)
--- 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