diff options
| author | bors <bors@rust-lang.org> | 2022-02-28 14:20:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-28 14:20:13 +0000 |
| commit | 97cde9fe08804a3a5208d77f6870ad7d43f8c9c3 (patch) | |
| tree | 0ce4d525840d0908e39d014a0a4ce413e9de64e2 /compiler/rustc_codegen_llvm/src | |
| parent | edda7e959d0dea66ec60b064f63bf275ad1c41c5 (diff) | |
| parent | ea39f46caddd3a4547517f82dd1d57a145d01b26 (diff) | |
| download | rust-97cde9fe08804a3a5208d77f6870ad7d43f8c9c3.tar.gz rust-97cde9fe08804a3a5208d77f6870ad7d43f8c9c3.zip | |
Auto merge of #94447 - matthiaskrgr:rollup-d8rj2xv, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #89793 (Add `slice::{from_ptr_range, from_mut_ptr_range} `)
- #92642 (Update search location from a relative path to absolute)
- #93389 (regression for issue 90847)
- #93413 (Fix broken link from rustdoc docs to ayu theme)
- #94365 (Fix MinGW target detection in raw-dylib)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/archive.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index 1a2cec2a0d9..f814cc93043 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -151,7 +151,9 @@ impl<'a> ArchiveBuilder<'a> for LlvmArchiveBuilder<'a> { output_path.with_extension("lib") }; - let mingw_gnu_toolchain = self.config.sess.target.llvm_target.ends_with("pc-windows-gnu"); + let target = &self.config.sess.target; + let mingw_gnu_toolchain = + target.vendor == "pc" && target.os == "windows" && target.env == "gnu"; let import_name_and_ordinal_vector: Vec<(String, Option<u16>)> = dll_imports .iter() |