From 4c5ab05741d804e46ee22cd157a4de863f6535f4 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 23 Mar 2011 17:48:53 -0700
Subject: rustc: Switch over to using rustllvm.dll exclusively, ending the
 "Franken-LLVM" problem

---
 src/comp/lib/llvm.rs |  2 +-
 src/comp/rustc.rc    | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/comp/lib/llvm.rs b/src/comp/lib/llvm.rs
index 5802fe19..1a643fe6 100644
--- a/src/comp/lib/llvm.rs
+++ b/src/comp/lib/llvm.rs
@@ -742,7 +742,7 @@ native mod llvm = llvm_lib {
     fn LLVMDisposeMemoryBuffer(MemoryBufferRef MemBuf);
 }
 
-native mod llvmext = llvmext_lib {
+native mod llvmext = llvm_lib {
     type ObjectFileRef;
     type SectionIteratorRef;
 
diff --git a/src/comp/rustc.rc b/src/comp/rustc.rc
index 7f1a7a03..a0c8aecb 100644
--- a/src/comp/rustc.rc
+++ b/src/comp/rustc.rc
@@ -52,24 +52,18 @@ auth pretty.pprust = impure;
 mod lib {
     alt (target_os) {
         case ("win32") {
-            let (llvm_lib = "LLVM-3.0svn.dll") {
-                let (llvmext_lib = "rustllvm.dll") {
-                    mod llvm;
-                }
+            let (llvm_lib = "rustllvm.dll") {
+                mod llvm;
             }
         }
         case ("macos") {
-            let (llvm_lib = "libLLVM-3.0svn.dylib") {
-                let (llvmext_lib = "librustllvm.dylib") {
-                    mod llvm;
-                }
+            let (llvm_lib = "librustllvm.dylib") {
+                mod llvm;
             }
         }
         else {
-            let (llvm_lib = "libLLVM-3.0svn.so") {
-                let (llvmext_lib = "librustllvm.so") {
-                    mod llvm;
-                }
+            let (llvm_lib = "librustllvm.so") {
+                mod llvm;
             }
         }
     }
-- 
cgit v1.2.3