---

yaml
---
r: 94015
b: refs/heads/try
c: 32688f8
h: refs/heads/master
i:
  94013: 1888f44
  94011: 153dde5
  94007: 72203f3
  93999: 56fbd5b
  93983: febed5b
  93951: 5e2a65a
v: v3

Author: Blei

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: df41115213e851b9f23dfea3d6782dea5243a5d4
+refs/heads/try: 32688f8f7448b131434bbd340e7163ecd6d0e8ac
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/back/link.rs

@@ -362,12 +362,12 @@ pub mod write {
             ~"-o", object.as_str().unwrap().to_owned(),
             assembly.as_str().unwrap().to_owned()];
 
-        debug!("{} {}", cc, args.connect(" "));
+        debug!("{} '{}'", cc, args.connect("' '"));
         let prog = run::process_output(cc, args);
 
         if !prog.status.success() {
             sess.err(format!("linking with `{}` failed: {}", cc, prog.status));
-            sess.note(format!("{} arguments: {}", cc, args.connect(" ")));
+            sess.note(format!("{} arguments: '{}'", cc, args.connect("' '")));
             sess.note(str::from_utf8(prog.error + prog.output));
             sess.abort_if_errors();
         }
@@ -1061,7 +1061,7 @@ fn link_natively(sess: Session, dylib: bool, obj_filename: &Path,
     let mut cc_args = sess.targ_cfg.target_strs.cc_args.clone();
     cc_args.push_all_move(link_args(sess, dylib, obj_filename, out_filename));
     if (sess.opts.debugging_opts & session::print_link_args) != 0 {
-        println!("{} link args: {}", cc_prog, cc_args.connect(" "));
+        println!("{} link args: '{}'", cc_prog, cc_args.connect("' '"));
     }
 
     // May have not found libraries in the right formats.
@@ -1073,7 +1073,7 @@ fn link_natively(sess: Session, dylib: bool, obj_filename: &Path,
 
     if !prog.status.success() {
         sess.err(format!("linking with `{}` failed: {}", cc_prog, prog.status));
-        sess.note(format!("{} arguments: {}", cc_prog, cc_args.connect(" ")));
+        sess.note(format!("{} arguments: '{}'", cc_prog, cc_args.connect("' '")));
         sess.note(str::from_utf8(prog.error + prog.output));
         sess.abort_if_errors();
     }

branches/try/src/librustc/driver/driver.rs

@@ -762,7 +762,13 @@ pub fn build_session_options(binary: @str,
     let ar = matches.opt_str("ar");
     let linker = matches.opt_str("linker");
     let linker_args = matches.opt_strs("link-args").flat_map( |a| {
-        a.split(' ').map(|arg| arg.to_owned()).collect()
+        a.split(' ').filter_map(|arg| {
+            if arg.is_empty() {
+                None
+            } else {
+                Some(arg.to_owned())
+            }
+        }).collect()
     });
 
     let cfg = parse_cfgspecs(matches.opt_strs("cfg"), demitter);

branches/try/src/test/run-make/prune-link-args/Makefile

@@ -0,0 +1,6 @@
+-include ../tools.mk
+# Notice the space in the end, this emulates the output of pkg-config
+RUSTC_FLAGS = --link-args "-lc "
+
+all:
+	$(RUSTC) $(RUSTC_FLAGS) empty.rs

branches/try/src/test/run-make/prune-link-args/empty.rs

@@ -0,0 +1 @@
+fn main() { }