@@ -524,15 +524,11 @@ pub unsafe fn guess_handle(handle: c_int) -> c_int {
524
524
// second copies of everything. We obviously don't want this, so instead of
525
525
// dying horribly during testing, we allow all of the test rustuv's references
526
526
// to get resolved to the original rustuv crate.
527
- #[ cfg( not( test) , not ( stage0 ) ) ]
527
+ #[ cfg( not( test) ) ]
528
528
#[ link( name = "uv_support" , kind = "static" ) ]
529
529
#[ link( name = "uv" , kind = "static" ) ]
530
530
extern { }
531
531
532
- #[ cfg( not( test) , stage0) ]
533
- #[ link_args = "-luv -luv_support" ]
534
- extern { }
535
-
536
532
extern {
537
533
fn rust_uv_loop_new ( ) -> * c_void ;
538
534
@@ -722,26 +718,19 @@ extern {
722
718
pub fn uv_signal_stop ( handle : * uv_signal_t ) -> c_int ;
723
719
}
724
720
725
- // various platform libraries required by libuv
726
- #[ cfg( not( stage0) , not( target_os = "android" ) ) ]
721
+ // libuv requires other native libraries on various platforms. These are all
722
+ // listed here (for each platform)
723
+
724
+ #[ cfg( not( target_os = "android" ) ) ] // apparently pthreads isn't on android?
727
725
#[ link( name = "pthread" ) ]
728
726
extern { }
729
- #[ cfg( stage0) ]
730
- #[ link_args = "-lpthread" ]
731
- extern { }
732
727
733
- #[ cfg( target_os = "win32" , not ( stage0 ) ) ]
728
+ #[ cfg( target_os = "win32" ) ]
734
729
#[ link( name = "ws2_32" ) ]
735
730
#[ link( name = "psapi" ) ]
736
731
#[ link( name = "iphlpapi" ) ]
737
732
extern { }
738
- #[ cfg( target_os = "win32" , stage0) ]
739
- #[ link_args = "-lws2_32 -lpsapi -liphlpapi" ]
740
- extern { }
741
733
742
- #[ cfg( target_os = "freebsd" , not ( stage0 ) ) ]
734
+ #[ cfg( target_os = "freebsd" ) ]
743
735
#[ link( name = "kvm" ) ]
744
736
extern { }
745
- #[ cfg( target_os = "freebsd" , stage0) ]
746
- #[ link_args = "-lkvm" ]
747
- extern { }
0 commit comments