diff options
| author | bors <bors@rust-lang.org> | 2024-04-06 08:39:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-06 08:39:09 +0000 |
| commit | 3f10032eb04a58d6d54caef0318f705042ca0ba1 (patch) | |
| tree | bb38c2a55c6cfbb911da2bfd82eb45c81749db86 /compiler/rustc_codegen_ssa/src | |
| parent | 8d490e33ad7bbcdeab7975be787653b1e46e48e4 (diff) | |
| parent | 58ac1b4244848103f3ef05360073d7b5c65f6fb9 (diff) | |
| download | rust-3f10032eb04a58d6d54caef0318f705042ca0ba1.tar.gz rust-3f10032eb04a58d6d54caef0318f705042ca0ba1.zip | |
Auto merge of #123540 - matthiaskrgr:rollup-8ewq0zt, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #123294 (Require LLVM_CONFIG to be set in rustc_llvm/build.rs) - #123467 (MSVC targets should use COFF as their archive format) - #123498 (explaining `DefKind::Field`) - #123519 (Improve cfg and check-cfg configuration) - #123525 (CFI: Don't rewrite ty::Dynamic directly) - #123526 (Do not ICE when calling incorrectly defined `transmute` intrinsic) - #123528 (Hide async_gen_internals from standard library documentation) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/archive.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/archive.rs b/compiler/rustc_codegen_ssa/src/back/archive.rs index 22b58c13949..ef55682d541 100644 --- a/compiler/rustc_codegen_ssa/src/back/archive.rs +++ b/compiler/rustc_codegen_ssa/src/back/archive.rs @@ -231,7 +231,11 @@ impl<'a> ArArchiveBuilder<'a> { "gnu" => ArchiveKind::Gnu, "bsd" => ArchiveKind::Bsd, "darwin" => ArchiveKind::Darwin, - "coff" => ArchiveKind::Coff, + "coff" => { + // FIXME: ar_archive_writer doesn't support COFF archives yet. + // https://github.com/rust-lang/ar_archive_writer/issues/9 + ArchiveKind::Gnu + } "aix_big" => ArchiveKind::AixBig, kind => { self.sess.dcx().emit_fatal(UnknownArchiveKind { kind }); |