about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-04-09 23:06:58 -0700
committerbors <bors@rust-lang.org>2013-04-09 23:06:58 -0700
commit7ebe5779b6965dc06e1204fe7eb2676792c8cb22 (patch)
treee944edf4d9844626d6a3979e6d14fe61be167c7f
parent6100bb5cba90091510298a314d1f48ede880367f (diff)
parent156a307f4b4f354c8e93a16f8ef64e95b9088bc7 (diff)
downloadrust-7ebe5779b6965dc06e1204fe7eb2676792c8cb22.tar.gz
rust-7ebe5779b6965dc06e1204fe7eb2676792c8cb22.zip
auto merge of #5813 : sanxiyn/rust/llvm-version, r=thestinger
See my [post](https://mail.mozilla.org/pipermail/rust-dev/2013-April/003518.html) on the mailing list for details.

Also:

* 3.2 is newer than 3.2svn, so I changed the ordering. (3.2svn is the version used between 3.2 and 3.3.)
* 3.3svn is added. This is the version you currently get from compiling LLVM trunk.
* 3.3 is added. 3.3 is not released yet, but this is the version used by http://llvm.org/apt/.
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 71beb8214b9..f09213404d1 100755
--- a/configure
+++ b/configure
@@ -533,7 +533,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-	(3.2svn|3.2|3.1svn|3.1|3.0svn|3.0)
+	(3.3|3.3svn|3.2|3.2svn)
 	    msg "found ok version of LLVM: $LLVM_VERSION"
 	    ;;
 	(*)