diff options
| author | bors <bors@rust-lang.org> | 2020-04-13 00:59:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-13 00:59:36 +0000 |
| commit | cc072281f9ebb828449cd37b0ffab37fd56017c1 (patch) | |
| tree | ee05782eba7b23d45d63491c1c61ebd5a4186097 /src/librustc_target | |
| parent | 9fed36055070168e5238d6bf6e58a36f519fe427 (diff) | |
| parent | a32e3408bf061787d81eac9d8bfdd5874efd56a6 (diff) | |
Auto merge of #71023 - mati865:mingw-unwind-linking-cleanup, r=Amanieu
[windows] Add testscase for self-contained executables and fix pthread linking Fixes https://github.com/rust-lang/rust/issues/71061
Diffstat (limited to 'src/librustc_target')
| -rw-r--r-- | src/librustc_target/spec/windows_base.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_target/spec/windows_base.rs b/src/librustc_target/spec/windows_base.rs index 39350c1618a..097ee09f1ea 100644 --- a/src/librustc_target/spec/windows_base.rs +++ b/src/librustc_target/spec/windows_base.rs @@ -57,9 +57,9 @@ pub fn opts() -> TargetOptions { // binaries to be redistributed without the libgcc_s-dw2-1.dll // dependency, but unfortunately break unwinding across DLL // boundaries when unwinding across FFI boundaries. - "-lgcc".to_string(), "-lgcc_eh".to_string(), - "-lpthread".to_string(), + "-l:libpthread.a".to_string(), + "-lgcc".to_string(), // libpthread depends on libmsvcrt, so we need to link it *again*. "-lmsvcrt".to_string(), "-lkernel32".to_string(), |