Auto merge of #42113 - segevfiner:fix-ole32-warning, r=petrochenkov

Fix: "warning: redundant linker flag specified for library `ole32`"

llvm-config seems to output this library name correctly now, removing
the need for the hack in "librustc_llvm/build.rs".
This commit is contained in:
bors 2017-05-20 12:05:33 +00:00
commit a0da1e0653

View File

@ -273,11 +273,8 @@ fn main() {
}
}
// LLVM requires symbols from this library, but apparently they're not printeds
// LLVM requires symbols from this library, but apparently they're not printed
// during llvm-config?
if target.contains("windows") {
println!("cargo:rustc-link-lib=ole32");
}
if target.contains("windows-gnu") {
println!("cargo:rustc-link-lib=static-nobundle=gcc_s");
println!("cargo:rustc-link-lib=static-nobundle=pthread");