Skip to content

Commit

Permalink
Auto merge of #42113 - segevfiner:fix-ole32-warning, r=petrochenkov
Browse files Browse the repository at this point in the history
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".
  • Loading branch information
bors committed May 20, 2017
2 parents 0bd9e1f + 2e0043a commit a0da1e0
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/librustc_llvm/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit a0da1e0

Please sign in to comment.