OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump LLVM version strings to 3.0svn, we're effectively tied to it now anyways.

Browse Source
This commit is contained in:
Graydon Hoare 2011-03-14 17:33:06 -07:00
parent 7f5bffc3ea
commit 316158df8e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -184,7 +184,7 @@ endif
ifneq ($(CFG_LLVM_CONFIG),)
CFG_LLVM_VERSION := $(shell $(CFG_LLVM_CONFIG) --version)
$(info cfg: found llvm-config at $(CFG_LLVM_CONFIG))
CFG_LLVM_ALLOWED_VERSIONS := 2.8svn 2.8 2.9svn 3.0svn
CFG_LLVM_ALLOWED_VERSIONS := 3.0svn
ifneq ($(findstring $(CFG_LLVM_VERSION),$(CFG_LLVM_ALLOWED_VERSIONS)),)
$(info cfg: using LLVM version $(CFG_LLVM_VERSION))
else

6
src/comp/rustc.rc
View File

@ -51,17 +51,17 @@ auth pretty.pprust = impure;
mod lib {
alt (target_os) {
case ("win32") {
let (llvm_lib = "LLVM-2.8.dll") {
let (llvm_lib = "LLVM-3.0.dll") {
mod llvm;
}
}
case ("macos") {
let (llvm_lib = "libLLVM-2.8svn.dylib") {
let (llvm_lib = "libLLVM-3.0svn.dylib") {
mod llvm;
}
}
else {
let (llvm_lib = "libLLVM-2.8svn.so") {
let (llvm_lib = "libLLVM-3.0svn.so") {
mod llvm;
}
}