From ed6694a9b5049ec066db45965b40351744df80bc Mon Sep 17 00:00:00 2001 From: Vadim Chugunov Date: Sat, 17 Aug 2013 17:08:51 -0700 Subject: [PATCH 1/3] Fixed -Z print-link-args --- src/librustc/back/link.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 91b6ee24110..262ebd4753c 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -26,6 +26,7 @@ use std::c_str::ToCStr; use std::char; use std::hash::Streaming; use std::hash; +use std::io; use std::libc::{c_int, c_uint}; use std::os::consts::{macos, freebsd, linux, android, win32}; use std::os; @@ -858,6 +859,10 @@ pub fn link_binary(sess: Session, debug!("output: %s", output.to_str()); let cc_args = link_args(sess, obj_filename, out_filename, lm); debug!("%s link args: %s", cc_prog, cc_args.connect(" ")); + if (sess.opts.debugging_opts & session::print_link_args) != 0 { + io::println(fmt!("%s link args: %s", cc_prog, cc_args.connect(" "))); + } + // We run 'cc' here let prog = run::process_output(cc_prog, cc_args); if 0 != prog.status { From c8354ff958677a8353744861e1bb7b08980f6bf5 Mon Sep 17 00:00:00 2001 From: Vadim Chugunov Date: Mon, 19 Aug 2013 15:28:13 -0700 Subject: [PATCH 2/3] Rename functional-struct-update.rs to avoid tripping Windows installer detector. (The "update" keyword in the test name makes Windows want to run it with elevated privileges, which fails of course) --- .../{functional-struct-update.rs => functional-struct-upd.rs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/test/run-pass/{functional-struct-update.rs => functional-struct-upd.rs} (100%) diff --git a/src/test/run-pass/functional-struct-update.rs b/src/test/run-pass/functional-struct-upd.rs similarity index 100% rename from src/test/run-pass/functional-struct-update.rs rename to src/test/run-pass/functional-struct-upd.rs From 2b1096854221d8d818dba92f9cd61820bf127dce Mon Sep 17 00:00:00 2001 From: Vadim Chugunov Date: Wed, 21 Aug 2013 11:54:30 -0700 Subject: [PATCH 3/3] Trimmed whitespace --- src/librustc/back/link.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 262ebd4753c..b1ce2137148 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -859,10 +859,10 @@ pub fn link_binary(sess: Session, debug!("output: %s", output.to_str()); let cc_args = link_args(sess, obj_filename, out_filename, lm); debug!("%s link args: %s", cc_prog, cc_args.connect(" ")); - if (sess.opts.debugging_opts & session::print_link_args) != 0 { + if (sess.opts.debugging_opts & session::print_link_args) != 0 { io::println(fmt!("%s link args: %s", cc_prog, cc_args.connect(" "))); } - + // We run 'cc' here let prog = run::process_output(cc_prog, cc_args); if 0 != prog.status {