Skip to content

Commit 0a7b730

Browse files
committed
use core::os::consts instead of hard coded contant value
1 parent d3034e5 commit 0a7b730

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/librustc/metadata/loader.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use lib::llvm::{False, llvm, mk_object_file, mk_section_iter};
1818
use metadata::filesearch::FileSearch;
1919
use io::WriterUtil;
2020
use syntax::parse::token::ident_interner;
21+
use core::os::consts::{macos, freebsd, linux, win32};
2122

2223
export os;
2324
export os_macos, os_win32, os_linux, os_freebsd;
@@ -67,10 +68,14 @@ fn find_library_crate(cx: ctxt) -> Option<{ident: ~str, data: @~[u8]}> {
6768
fn libname(cx: ctxt) -> {prefix: ~str, suffix: ~str} {
6869
if cx.static { return {prefix: ~"lib", suffix: ~".rlib"}; }
6970
match cx.os {
70-
os_win32 => return {prefix: ~"", suffix: ~".dll"},
71-
os_macos => return {prefix: ~"lib", suffix: ~".dylib"},
72-
os_linux => return {prefix: ~"lib", suffix: ~".so"},
73-
os_freebsd => return {prefix: ~"lib", suffix: ~".so"}
71+
os_win32 => return {prefix: win32::dll_prefix(),
72+
suffix: win32::dll_suffix()},
73+
os_macos => return {prefix: macos::dll_prefix(),
74+
suffix: macos::dll_suffix()},
75+
os_linux => return {prefix: linux::dll_prefix(),
76+
suffix: linux::dll_suffix()},
77+
os_freebsd => return {prefix: freebsd::dll_prefix(),
78+
suffix: freebsd::dll_suffix()}
7479
}
7580
}
7681

0 commit comments

Comments
 (0)