about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-04-01 00:27:23 +0200
committerGitHub <noreply@github.com>2020-04-01 00:27:23 +0200
commitddcc281e8953cdb2a9ea422ce909d2c65a7928db (patch)
treef0298c45905843364f954b715c3f18bf77a4b671 /src
parent81f19ec90925dd603ec17b9d79d2817f00fdbc7f (diff)
parent1ae3b5022bf767161ca336f718cf823e3147e419 (diff)
downloadrust-ddcc281e8953cdb2a9ea422ce909d2c65a7928db.tar.gz
rust-ddcc281e8953cdb2a9ea422ce909d2c65a7928db.zip
Rollup merge of #70605 - Amanieu:pthread_msvcrt, r=varkor
Add missing -lmsvcrt on mingw after -lpthread

Fixes #70316
Diffstat (limited to 'src')
-rw-r--r--src/librustc_target/spec/windows_base.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/librustc_target/spec/windows_base.rs b/src/librustc_target/spec/windows_base.rs
index 188548b41fe..5f59ca8a5a3 100644
--- a/src/librustc_target/spec/windows_base.rs
+++ b/src/librustc_target/spec/windows_base.rs
@@ -60,6 +60,8 @@ pub fn opts() -> TargetOptions {
             "-lgcc".to_string(),
             "-lgcc_eh".to_string(),
             "-lpthread".to_string(),
+            // libpthread depends on libmsvcrt, so we need to link it *again*.
+            "-lmsvcrt".to_string(),
             "-lkernel32".to_string(),
         ],
     );