bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Port ArchiveBuildFailure

Browse source
This commit is contained in:
SLASHLogin 2022-08-26 14:11:47 +02:00
parent 978b5f73e4
commit d32caf9ced
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_llvm/src/back/archive.rs
View file

@ -12,7 +12,7 @@ use std::str;
use object::read::macho::FatArch;
use crate::common;
use crate::errors::ErrorCreatingImportLibrary;
use crate::errors::{ErrorCreatingImportLibrary, ArchiveBuildFailure};
use crate::llvm::archive_ro::{ArchiveRO, Child};
use crate::llvm::{self, ArchiveKind, LLVMMachineType, LLVMRustCOFFShortExport};
use rustc_codegen_ssa::back::archive::{ArchiveBuilder, ArchiveBuilderBuilder};
@ -148,7 +148,7 @@ impl<'a> ArchiveBuilder<'a> for LlvmArchiveBuilder<'a> {
fn build(mut self: Box<Self>, output: &Path) -> bool {
match self.build_with_llvm(output) {
Ok(any_members) => any_members,
Err(e) => self.sess.fatal(&format!("failed to build archive: {}", e)),
Err(e) => self.sess.emit_fatal(ArchiveBuildFailure { error: e }),
}
}
}

6
compiler/rustc_codegen_llvm/src/errors.rs
View file

@ -84,3 +84,9 @@ pub(crate) struct LinkageConstOrMutType {
#[derive(SessionDiagnostic)]
#[diag(codegen_llvm::sanitizer_memtag_requires_mte)]
pub(crate) struct SanitizerMemtagRequiresMte;
#[derive(SessionDiagnostic)]
#[diag(codegen_llvm::archive_build_failure)]
pub(crate) struct ArchiveBuildFailure {
pub error: std::io::Error,
}