Skip to content

Commit a0da1e0

Browse files
committed
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".
2 parents 0bd9e1f + 2e0043a commit a0da1e0

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/librustc_llvm/build.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,8 @@ fn main() {
273273
}
274274
}
275275

276-
// LLVM requires symbols from this library, but apparently they're not printeds
276+
// LLVM requires symbols from this library, but apparently they're not printed
277277
// during llvm-config?
278-
if target.contains("windows") {
279-
println!("cargo:rustc-link-lib=ole32");
280-
}
281278
if target.contains("windows-gnu") {
282279
println!("cargo:rustc-link-lib=static-nobundle=gcc_s");
283280
println!("cargo:rustc-link-lib=static-nobundle=pthread");

0 commit comments

Comments
 (0)