diff options
| author | bors <bors@rust-lang.org> | 2016-02-15 13:04:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-15 13:04:00 +0000 |
| commit | 3a254fe4bd10f630da76e89cbdc1275413a189d8 (patch) | |
| tree | 32b59f270d0575c11d0d6a99839e4583c4af3f42 | |
| parent | 9a7913786c2e1923e30faf7c6eb680546259653c (diff) | |
| parent | 999051dbe32cc77c76036ea947ec38ecca20a8b7 (diff) | |
| download | rust-3a254fe4bd10f630da76e89cbdc1275413a189d8.tar.gz rust-3a254fe4bd10f630da76e89cbdc1275413a189d8.zip | |
Auto merge of #31640 - rkruppe:require-py27, r=sanxiyn
In other words, enforce what was documented in #30626 (and also stop blaming it on LLVM, we have at least one Python script of our own). Also, there is no Python later than 2.7 and there never will be.
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | configure | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md index 293f585d105..a83f51e1571 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Read ["Installing Rust"] from [The Book]. 1. Make sure you have installed the dependencies: * `g++` 4.7 or `clang++` 3.x - * `python` 2.7 or later (but not 3.x) + * `python` 2.7 (but not 3.x) * GNU `make` 3.81 or later * `curl` * `git` diff --git a/configure b/configure index 7958ac9bfcf..c05765975d4 100755 --- a/configure +++ b/configure @@ -729,12 +729,12 @@ step_msg "looking for build programs" probe_need CFG_CURLORWGET curl wget if [ -z "$CFG_PYTHON_PROVIDED" ]; then - probe_need CFG_PYTHON python2.7 python2.6 python2 python + probe_need CFG_PYTHON python2.7 python2 python fi 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" +if [ $(echo $python_version | grep -c '^Python 2\.7') -ne 1 ]; then + err "Found $python_version, but Python 2.7 is required" fi # If we have no git directory then we are probably a tarball distribution |