Skip to content

Commit 316158d

Browse files
committed
Bump LLVM version strings to 3.0svn, we're effectively tied to it now anyways.
1 parent 7f5bffc commit 316158d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ endif
184184
ifneq ($(CFG_LLVM_CONFIG),)
185185
CFG_LLVM_VERSION := $(shell $(CFG_LLVM_CONFIG) --version)
186186
$(info cfg: found llvm-config at $(CFG_LLVM_CONFIG))
187-
CFG_LLVM_ALLOWED_VERSIONS := 2.8svn 2.8 2.9svn 3.0svn
187+
CFG_LLVM_ALLOWED_VERSIONS := 3.0svn
188188
ifneq ($(findstring $(CFG_LLVM_VERSION),$(CFG_LLVM_ALLOWED_VERSIONS)),)
189189
$(info cfg: using LLVM version $(CFG_LLVM_VERSION))
190190
else

src/comp/rustc.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ auth pretty.pprust = impure;
5151
mod lib {
5252
alt (target_os) {
5353
case ("win32") {
54-
let (llvm_lib = "LLVM-2.8.dll") {
54+
let (llvm_lib = "LLVM-3.0.dll") {
5555
mod llvm;
5656
}
5757
}
5858
case ("macos") {
59-
let (llvm_lib = "libLLVM-2.8svn.dylib") {
59+
let (llvm_lib = "libLLVM-3.0svn.dylib") {
6060
mod llvm;
6161
}
6262
}
6363
else {
64-
let (llvm_lib = "libLLVM-2.8svn.so") {
64+
let (llvm_lib = "libLLVM-3.0svn.so") {
6565
mod llvm;
6666
}
6767
}

0 commit comments

Comments
 (0)