about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src
diff options
context:
space:
mode:
authorMateusz Mikuła <mati865@gmail.com>2022-03-06 15:12:50 +0100
committerMateusz Mikuła <mati865@gmail.com>2022-05-13 20:14:15 +0200
commit60361f2ca34f24955aff729826971c43ec254cf8 (patch)
tree326910cf89e8250bbc81efbf03da5ee805c33d37 /compiler/rustc_codegen_llvm/src
parenta7d6408b05912396618dfdcc9cc713d3ace2aa9a (diff)
downloadrust-60361f2ca34f24955aff729826971c43ec254cf8.tar.gz
rust-60361f2ca34f24955aff729826971c43ec254cf8.zip
Add LLVM based mingw-w64 targets
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
-rw-r--r--compiler/rustc_codegen_llvm/src/back/archive.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs
index f814cc93043..8f6438e85ad 100644
--- a/compiler/rustc_codegen_llvm/src/back/archive.rs
+++ b/compiler/rustc_codegen_llvm/src/back/archive.rs
@@ -152,8 +152,10 @@ impl<'a> ArchiveBuilder<'a> for LlvmArchiveBuilder<'a> {
         };
 
         let target = &self.config.sess.target;
-        let mingw_gnu_toolchain =
-            target.vendor == "pc" && target.os == "windows" && target.env == "gnu";
+        let mingw_gnu_toolchain = target.vendor == "pc"
+            && target.os == "windows"
+            && target.env == "gnu"
+            && target.abi.is_empty();
 
         let import_name_and_ordinal_vector: Vec<(String, Option<u16>)> = dll_imports
             .iter()