---

yaml
---
r: 154863
b: refs/heads/try2
c: b5a0b70
h: refs/heads/master
i:
  154861: 456bfec
  154859: 5a27d94
  154855: 82580a4
  154847: 5276966
v: v3

Author: spernsteiner

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 4b70269854a701668ba47641201c4403228db06b
+refs/heads/try2: b5a0b700c64639043bce0a2ba0a8b40dd853d469
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/back/write.rs

@@ -604,17 +604,34 @@ pub fn run_passes(sess: &Session,
     };
 
     let link_obj = |output_path: &Path| {
-        let mut cmd = Command::new("ld");
+        let pname = get_cc_prog(sess);
+        let mut cmd = Command::new(pname.as_slice());
+
+        cmd.args(sess.targ_cfg.target_strs.cc_args.as_slice());
+        cmd.arg("-nostdlib");
 
         for index in range(0, trans.modules.len()) {
             cmd.arg(crate_output.with_extension(format!("{}.o", index).as_slice()));
         }
 
         cmd.arg("-r").arg("-o").arg(output_path);
+
+        if (sess.opts.debugging_opts & config::PRINT_LINK_ARGS) != 0 {
+            println!("{}", &cmd);
+        }
+
         cmd.stdin(::std::io::process::Ignored)
            .stdout(::std::io::process::InheritFd(1))
            .stderr(::std::io::process::InheritFd(2));
-        cmd.status().unwrap();
+        match cmd.status() {
+            Ok(_) => {},
+            Err(e) => {
+                sess.err(format!("could not exec the linker `{}`: {}",
+                                 pname,
+                                 e).as_slice());
+                sess.abort_if_errors();
+            },
+        }
     };
 
     // Flag to indicate whether the user explicitly requested bitcode.