File tree 3 files changed +9
-10
lines changed
3 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -850,7 +850,7 @@ pub fn family() -> ~str { ~"unix" }
850
850
851
851
#[ cfg( windows) ]
852
852
pub fn family ( ) -> ~str { ~"windows" }
853
-
853
+
854
854
855
855
mod consts {
856
856
@@ -886,7 +886,7 @@ mod consts {
886
886
pub fn dll_suffix ( ) -> ~str { ~". so" }
887
887
pub fn exe_suffix ( ) -> ~str { ~"" }
888
888
}
889
-
889
+
890
890
pub mod win32 {
891
891
pub fn sysname ( ) -> ~str { ~"win32" }
892
892
pub fn dll_prefix ( ) -> ~str { ~"" }
Original file line number Diff line number Diff line change @@ -639,10 +639,10 @@ fn output_dll_filename(os: session::os, lm: &link_meta) -> ~str {
639
639
session:: os_macos =>
640
640
macos:: dll_prefix ( ) + libname + macos:: dll_suffix ( ) ,
641
641
session:: os_freebsd =>
642
- freebsd:: dll_prefix ( ) + libname + macos :: dll_suffix ( ) ,
642
+ freebsd:: dll_prefix ( ) + libname + freebsd :: dll_suffix ( ) ,
643
643
session:: os_linux =>
644
- freebsd :: dll_prefix ( ) + libname + macos :: dll_suffix ( ) ,
645
- session:: os_win32 =>
644
+ linux :: dll_prefix ( ) + libname + linux :: dll_suffix ( ) ,
645
+ session:: os_win32 =>
646
646
win32:: dll_prefix ( ) + libname + win32:: dll_suffix ( ) ,
647
647
}
648
648
}
@@ -665,8 +665,7 @@ fn link_binary(sess: Session,
665
665
666
666
let output = if sess. building_library {
667
667
let long_libname = output_dll_filename ( sess. targ_cfg . os , & lm) ;
668
-
669
- debug ! ( "link_meta.name: %s" , lm. name) ;
668
+ debug ! ( "link_meta.name: %s" , lm. name) ;
670
669
debug ! ( "long_libname: %s" , long_libname) ;
671
670
debug ! ( "out_filename: %s" , out_filename. to_str( ) ) ;
672
671
debug ! ( "dirname(out_filename): %s" , out_filename. dir_path( ) . to_str( ) ) ;
Original file line number Diff line number Diff line change @@ -68,13 +68,13 @@ fn find_library_crate(cx: ctxt) -> Option<{ident: ~str, data: @~[u8]}> {
68
68
fn libname ( cx : ctxt ) -> { prefix : ~str , suffix : ~str } {
69
69
if cx. static { return { prefix: ~"lib", suffix: ~". rlib "} ; }
70
70
match cx. os {
71
- os_win32 => return { prefix: win32:: dll_prefix ( ) ,
71
+ os_win32 => return { prefix: win32:: dll_prefix ( ) ,
72
72
suffix: win32:: dll_suffix ( ) } ,
73
73
os_macos => return { prefix: macos:: dll_prefix ( ) ,
74
74
suffix: macos:: dll_suffix ( ) } ,
75
- os_linux => return { prefix: linux:: dll_prefix ( ) ,
75
+ os_linux => return { prefix: linux:: dll_prefix ( ) ,
76
76
suffix: linux:: dll_suffix ( ) } ,
77
- os_freebsd => return { prefix: freebsd:: dll_prefix ( ) ,
77
+ os_freebsd => return { prefix: freebsd:: dll_prefix ( ) ,
78
78
suffix: freebsd:: dll_suffix ( ) }
79
79
}
80
80
}
You can’t perform that action at this time.
0 commit comments