Skip to content

Commit 25671fa

Browse files
authored
Rollup merge of rust-lang#73507 - mati865:cleanup-mingw-llvm-linkage, r=matthewjasper
Cleanup MinGW LLVM linkage workaround LLVM correctly passes `uuid` for a long time, GCC unwinding library (either static or dynamic) comes from [windows_gnu_base](https://github.com/rust-lang/rust/blob/06e47688bf15d0215edbe05b21603062f6d2eb5d/src/librustc_target/spec/windows_gnu_base.rs).
2 parents 10d655b + 8a816ca commit 25671fa

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

Diff for: src/librustc_llvm/build.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,9 @@ fn main() {
293293
}
294294
}
295295

296-
// LLVM requires symbols from this library, but apparently they're not printed
297-
// during llvm-config?
296+
// Libstdc++ depends on pthread which Rust doesn't link on MinGW
297+
// since nothing else requires it.
298298
if target.contains("windows-gnu") {
299-
println!("cargo:rustc-link-lib=static-nobundle=gcc_s");
300299
println!("cargo:rustc-link-lib=static-nobundle=pthread");
301-
println!("cargo:rustc-link-lib=dylib=uuid");
302300
}
303301
}

0 commit comments

Comments
 (0)