diff options
| author | Graydon Hoare <[email protected]> | 2011-03-14 17:33:06 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2011-03-14 17:33:06 -0700 |
| commit | 316158df8e423f6c123cf2d3349e27c2794b147b (patch) | |
| tree | cfbda60772d229a4050a7915b9667c23a57c4155 | |
| parent | Merge remote branch 'brson/recursive-elseif' (diff) | |
| download | rust-316158df8e423f6c123cf2d3349e27c2794b147b.tar.xz rust-316158df8e423f6c123cf2d3349e27c2794b147b.zip | |
Bump LLVM version strings to 3.0svn, we're effectively tied to it now anyways.
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/comp/rustc.rc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 74359c00..86c8d45c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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 diff --git a/src/comp/rustc.rc b/src/comp/rustc.rc index 006aca62..c3cae312 100644 --- a/src/comp/rustc.rc +++ b/src/comp/rustc.rc @@ -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; } } |