diff options
| author | bors <bors@rust-lang.org> | 2020-08-10 02:08:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-10 02:08:35 +0000 |
| commit | 568f6195bbf3c04a601a297a386e0e1dc0ca8333 (patch) | |
| tree | c8dc09087cf0246f734073973e1ce15d05c0ad88 /src/librustc_codegen_ssa | |
| parent | cee62c17aa3e413e8541b3f60b800a365368e94e (diff) | |
| parent | 08990e5c7554d4d6a0440debc2edc99c8e9565c8 (diff) | |
| download | rust-568f6195bbf3c04a601a297a386e0e1dc0ca8333.tar.gz rust-568f6195bbf3c04a601a297a386e0e1dc0ca8333.zip | |
Auto merge of #74410 - mati865:mingw-no-self-contained-when-cross-compiling, r=petrochenkov
MinGW: disable self-contained mode when cross compiling When cross compiling users have to provide own linker and libraries anyway. Using rust provided MinGW crt objects is harmful here and has no benefits. cc https://github.com/rust-lang/rust/issues/68887
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/link.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs index 9191c68d453..6912667c391 100644 --- a/src/librustc_codegen_ssa/back/link.rs +++ b/src/librustc_codegen_ssa/back/link.rs @@ -1295,7 +1295,9 @@ fn crt_objects_fallback(sess: &Session, crate_type: CrateType) -> bool { Some(CrtObjectsFallback::Musl) => sess.crt_static(Some(crate_type)), // FIXME: Find some heuristic for "native mingw toolchain is available", // likely based on `get_crt_libs_path` (https://github.com/rust-lang/rust/pull/67429). - Some(CrtObjectsFallback::Mingw) => sess.target.target.target_vendor != "uwp", + Some(CrtObjectsFallback::Mingw) => { + sess.host == sess.target.target && sess.target.target.target_vendor != "uwp" + } // FIXME: Figure out cases in which WASM needs to link with a native toolchain. Some(CrtObjectsFallback::Wasm) => true, None => false, |