nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-02 19:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto merge of #10997 : cadencemarseille/rust/issue-10755-ICE-for-missing-linker, r=alexcrichton

Browse Source 
Trap the io_error condition so that a more informative error message is
displayed when the linker program cannot be started, such as when the
name of the linker binary is accidentally mistyped.

closes #10755
This commit is contained in:
bors 2013-12-21 22:16:37 -08:00
commit cd13f4d599
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librustc/back/link.rs
View File

@ -33,6 +33,7 @@ use std::os::consts::{macos, freebsd, linux, android, win32};
use std::ptr;
use std::run;
use std::str;
use std::io;
use std::io::fs;
use extra::tempfile::TempDir;
use syntax::abi;
@ -97,6 +98,7 @@ pub mod write {
use util::common::time;
use std::c_str::ToCStr;
use std::io;
use std::libc::{c_uint, c_int};
use std::path::Path;
use std::run;
@ -310,7 +312,11 @@ pub mod write {
assembly.as_str().unwrap().to_owned()];
debug!("{} '{}'", cc, args.connect("' '"));
match run::process_output(cc, args) {
let opt_prog = {
let _guard = io::ignore_io_error();
run::process_output(cc, args)
};
match opt_prog {
Some(prog) => {
if !prog.status.success() {
sess.err(format!("linking with `{}` failed: {}", cc, prog.status));
@ -320,7 +326,7 @@ pub mod write {
}
},
None => {
sess.err(format!("could not exec `{}`", cc));
sess.err(format!("could not exec the linker `{}`", cc));
sess.abort_if_errors();
}
}
@ -952,8 +958,11 @@ fn link_natively(sess: Session, dylib: bool, obj_filename: &Path,
// Invoke the system linker
debug!("{} {}", cc_prog, cc_args.connect(" "));
let opt_prog = time(sess.time_passes(), "running linker", (), |()|
run::process_output(cc_prog, cc_args));
let opt_prog = {
let _guard = io::ignore_io_error();
time(sess.time_passes(), "running linker", (), |()|
run::process_output(cc_prog, cc_args))
};
match opt_prog {
Some(prog) => {
@ -965,7 +974,7 @@ fn link_natively(sess: Session, dylib: bool, obj_filename: &Path,
}
},
None => {
sess.err(format!("could not exec `{}`", cc_prog));
sess.err(format!("could not exec the linker `{}`", cc_prog));
sess.abort_if_errors();
}
}

15
src/test/compile-fail/issue-10755.rs Normal file
View File

@ -0,0 +1,15 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// compile-flags: --linker=llllll
// error-pattern: the linker `llllll`
fn main() {
}