about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-10 18:18:45 +0000
committerbors <bors@rust-lang.org>2015-09-10 18:18:45 +0000
commit79c6a4d55cfcce0cd3512b162b78dbd1497acea3 (patch)
tree979b6145310c40bf89126fbf09ca0c120eee9a1f
parent250679e20d04104d6ff2888a3486d02a9f490248 (diff)
parent0ad631cf7c6661a03de9a2ee867738c1de850e8d (diff)
downloadrust-79c6a4d55cfcce0cd3512b162b78dbd1497acea3.tar.gz
rust-79c6a4d55cfcce0cd3512b162b78dbd1497acea3.zip
Auto merge of #28318 - dongz9:master, r=eddyb
Fix the following error when running configure with llvm 3.8svn:

configure: error: bad LLVM version: 3.8.0svn, need >=3.5
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 45e137d4a9f..604c1961174 100755
--- a/configure
+++ b/configure
@@ -956,7 +956,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.[5-7]*)
+        (3.[5-8]*)
             msg "found ok version of LLVM: $LLVM_VERSION"
             ;;
         (*)
@@ -1030,7 +1030,7 @@ then
             esac
         else
             case $CFG_CLANG_VERSION in
-                (3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7*)
+                (3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7* | 3.8*)
                 step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
                 ;;
                 (*)