Drop advapi32 and shell32 from late_link_args.

src/librustc_back/target/windows_base.rs

@@ -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(),
         ),

src/libstd/sys/windows/c.rs

@@ -354,6 +354,7 @@ pub type PVECTORED_EXCEPTION_HANDLER = extern "system"
 
 #[link(name = "ws2_32")]
 #[link(name = "userenv")]
+#[link(name = "shell32")]
 extern "system" {
     pub fn WSAStartup(wVersionRequested: libc::WORD,
                       lpWSAData: LPWSADATA) -> libc::c_int;