Skip to content

Commit e026fba

Browse files
committed
---
yaml --- r: 3283 b: refs/heads/master c: 28d1626 h: refs/heads/master i: 3281: b92f70b 3279: af1db64 v: v3
1 parent e0b2853 commit e026fba

File tree

3 files changed

+3
-22
lines changed

3 files changed

+3
-22
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 2ad0954941c839474f501252cf1551ff94bd5903
2+
refs/heads/master: 28d1626221f50cf44c8d95abb40059a389e3fae7

trunk/src/comp/lib/llvm.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ const uint LLVMRealULT = 12u;
125125
const uint LLVMRealULE = 13u;
126126
const uint LLVMRealUNE = 14u;
127127

128-
native mod llvm = llvm_lib {
128+
native mod llvm = "rustllvm" {
129129

130130
type ModuleRef;
131131
type ContextRef;
@@ -883,9 +883,6 @@ native mod llvm = llvm_lib {
883883
fn LLVMLinkModules(ModuleRef Dest, ModuleRef Src) -> Bool;
884884
}
885885

886-
native mod rustllvm = llvm_lib {
887-
}
888-
889886
/* Slightly more terse object-interface to LLVM's 'builder' functions. For the
890887
* most part, build.Foo() wraps LLVMBuildFoo(), threading the correct
891888
* BuilderRef B into place. A BuilderRef is a cursor-like LLVM value that

trunk/src/comp/rustc.rc

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,7 @@ auth middle::trans = unsafe;
8080
auth lib::llvm = unsafe;
8181

8282
mod lib {
83-
alt (target_os) {
84-
case ("win32") {
85-
let (llvm_lib = "rustllvm.dll") {
86-
mod llvm;
87-
}
88-
}
89-
case ("macos") {
90-
let (llvm_lib = "librustllvm.dylib") {
91-
mod llvm;
92-
}
93-
}
94-
case (_) {
95-
let (llvm_lib = "librustllvm.so") {
96-
mod llvm;
97-
}
98-
}
99-
}
83+
mod llvm;
10084
}
10185

10286
// Local Variables:

0 commit comments

Comments
 (0)