diff options
| author | bors <bors@rust-lang.org> | 2014-03-30 17:21:40 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-30 17:21:40 -0700 |
| commit | 612e22e417b41326b2060416892c7b16d921e20b (patch) | |
| tree | d78e33aae25e1349364290221504b6aad9387816 | |
| parent | 2674a16c18df1841b3cc143e551e7eac6ded7423 (diff) | |
| parent | 9f990f74b3020b2639944add7012e01f22cb135b (diff) | |
| download | rust-612e22e417b41326b2060416892c7b16d921e20b.tar.gz rust-612e22e417b41326b2060416892c7b16d921e20b.zip | |
auto merge of #13216 : alexcrichton/rust/fix-configure-for-travis, r=sfackler
The previous regex was a bit to strict, rejecting versions such as 3.4.1 which is apparently the version which travis is currently installing, causing all travis builds to fail.
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure index 90966bd57b4..3fe0f376feb 100755 --- a/configure +++ b/configure @@ -610,7 +610,7 @@ then LLVM_VERSION=$($LLVM_CONFIG --version) case $LLVM_VERSION in - (3.[2-5]svn|3.[2-5]) + (3.[2-5]*) msg "found ok version of LLVM: $LLVM_VERSION" ;; (*) |