Skip to content

Commit a12ae4c

Browse files
committed
---
yaml --- r: 5858 b: refs/heads/master c: cff9c67 h: refs/heads/master v: v3
1 parent 8f642f9 commit a12ae4c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 8124846b2c945f661a6bb85e66e22ca987891dc4
2+
refs/heads/master: cff9c676748b719d5333aa7521e4684f3543e4b9

trunk/src/comp/back/link.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,10 +596,11 @@ fn link_binary(sess: session::session,
596596

597597
log #fmt("gcc link args: %s", str::connect(gcc_args, " "));
598598
// We run 'gcc' here
599-
let err_code = run::run_program(prog, gcc_args);
600-
if 0 != err_code {
601-
sess.err(#fmt["linking with gcc failed with code %d", err_code]);
599+
let prog = run::program_output(prog, gcc_args);
600+
if 0 != prog.status {
601+
sess.err(#fmt["linking with gcc failed with code %d", prog.status]);
602602
sess.note(#fmt["gcc arguments: %s", str::connect(gcc_args, " ")]);
603+
sess.note(prog.err + prog.out);
603604
sess.abort_if_errors();
604605
}
605606
// Clean up on Darwin

0 commit comments

Comments
 (0)