From afc3046515064e9f40d9f6ad491b4791c3d0c8af Mon Sep 17 00:00:00 2001
From: Vadim Chugunov <vadimcn@gmail.com>
Date: Fri, 23 Oct 2015 09:35:02 -0700
Subject: [PATCH] Drop `advapi32` and `shell32` from late_link_args.

---
 src/librustc_back/target/windows_base.rs | 2 --
 src/libstd/sys/windows/c.rs              | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/librustc_back/target/windows_base.rs b/src/librustc_back/target/windows_base.rs
index 4fa57726ef5f..634a63cf0bb3 100644
--- a/src/librustc_back/target/windows_base.rs
+++ b/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(),
         ),
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs
index bac5b47eb1a6..69f15219f69a 100644
--- a/src/libstd/sys/windows/c.rs
+++ b/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;