bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Port ErrorCallingDllTool

Browse source
This commit is contained in:
SLASHLogin 2022-08-26 14:29:33 +02:00
parent ddbb650289
commit 81f7a8d7f1
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,9 @@ use std::str;
use object::read::macho::FatArch;
use crate::common;
use crate::errors::{ArchiveBuildFailure, ErrorCreatingImportLibrary, ErrorWritingDEFFile};
use crate::errors::{
ArchiveBuildFailure, ErrorCallingDllTool, ErrorCreatingImportLibrary, ErrorWritingDEFFile,
};
use crate::llvm::archive_ro::{ArchiveRO, Child};
use crate::llvm::{self, ArchiveKind, LLVMMachineType, LLVMRustCOFFShortExport};
use rustc_codegen_ssa::back::archive::{ArchiveBuilder, ArchiveBuilderBuilder};
@ -240,7 +242,7 @@ impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder {
match result {
Err(e) => {
sess.fatal(&format!("Error calling dlltool: {}", e));
sess.emit_fatal(ErrorCallingDllTool { error: e });
}
Ok(output) if !output.status.success() => sess.fatal(&format!(
"Dlltool could not create import library: {}\n{}",

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

@ -96,3 +96,9 @@ pub(crate) struct ArchiveBuildFailure {
pub(crate) struct ErrorWritingDEFFile {
pub error: std::io::Error,
}
#[derive(SessionDiagnostic)]
#[diag(codegen_llvm::error_calling_dlltool)]
pub(crate) struct ErrorCallingDllTool {
pub error: std::io::Error,
}