]> git.lizzy.rs Git - rust.git/commitdiff
Drop `advapi32` and `shell32` from late_link_args.
authorVadim Chugunov <vadimcn@gmail.com>
Fri, 23 Oct 2015 16:35:02 +0000 (09:35 -0700)
committerVadim Chugunov <vadimcn@gmail.com>
Fri, 23 Oct 2015 16:35:02 +0000 (09:35 -0700)
src/librustc_back/target/windows_base.rs
src/libstd/sys/windows/c.rs

index 4fa57726ef5f0fcc7947a2814f5299dc565618ad..634a63cf0bb34c5fdc7ca211bf666fd4bb8ff4d2 100644 (file)
@@ -77,8 +77,6 @@ pub fn opts() -> TargetOptions {
             "-lmingw32".to_string(),
             "-lgcc".to_string(), // alas, mingw* libraries above depend on libgcc
             "-lmsvcrt".to_string(),
-            "-ladvapi32".to_string(),
-            "-lshell32".to_string(),
             "-luser32".to_string(),
             "-lkernel32".to_string(),
         ),
index bac5b47eb1a6228e660f3511a34e61f3c49fbd01..69f15219f69a9b319cb6e0b46f34969d113fe241 100644 (file)
@@ -354,6 +354,7 @@ pub struct EXCEPTION_POINTERS {
 
 #[link(name = "ws2_32")]
 #[link(name = "userenv")]
+#[link(name = "shell32")]
 extern "system" {
     pub fn WSAStartup(wVersionRequested: libc::WORD,
                       lpWSAData: LPWSADATA) -> libc::c_int;