Make sure that -lole32 ends up *after* LLVM libs on the linker command line.

diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
index 2b945e0a3afaff2f8e7d8ffe10335be2e719bbea..7d5887e699fd7fdb2329291736ca32a7130ec1f6 100644 (file)
--- a/src/librustc_llvm/build.rs
+++ b/src/librustc_llvm/build.rs
@@ -259,4 +259,10 @@ fn main() {
             println!("cargo:rustc-link-lib={}", stdcppname);
         }
     }
+
+    // LLVM requires symbols from this library, but apparently they're not printeds
+    // during llvm-config?
+    if target.contains("windows") {
+        println!("cargo:rustc-link-lib=ole32");
+    }
 }

diff --git a/src/librustc_llvm/ffi.rs b/src/librustc_llvm/ffi.rs
index 26c7a9166e68e9280ed8a683cc421944d530de60..32c9183ece999ff742f7d33f1dd9b0b92fddda20 100644 (file)
--- a/src/librustc_llvm/ffi.rs
+++ b/src/librustc_llvm/ffi.rs
@@ -1662,10 +1662,3 @@ pub fn LLVMRustBuildOperandBundleDef(Name: *const c_char,
     pub fn LLVMRustUnsetComdat(V: ValueRef);
     pub fn LLVMRustSetModulePIELevel(M: ModuleRef);
 }
-
-
-// LLVM requires symbols from this library, but apparently they're not printed
-// during llvm-config?
-#[cfg(windows)]
-#[link(name = "ole32")]
-extern "C" {}