From 37829af09d1ec05fe520e0d57a1872d287241e16 Mon Sep 17 00:00:00 2001 From: Kyle Aleshire Date: Wed, 4 Jan 2017 18:23:19 -0600 Subject: [PATCH 1/2] Warn that the name is ignored if a link target is emitted --- src/librustc_driver/driver.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index e9c14b4f99c22..536728308b03d 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -1335,9 +1335,10 @@ pub fn build_output_filenames(input: &Input, .values() .filter(|a| a.is_none()) .count(); - let ofile = if unnamed_output_types > 1 { - sess.warn("ignoring specified output filename because multiple outputs were \ - requested"); + let ofile = if unnamed_output_types > 1 && + sess.opts.output_types.contains_key(&OutputType::Exe) { + sess.warn("ignoring output name requested with -o for \"link\" output because \ + multiple outputs were requested"); None } else { Some(out_file.clone()) From 4af830a2c83b6e54d2979d63ece51a2f157e7bae Mon Sep 17 00:00:00 2001 From: Kyle Aleshire Date: Fri, 6 Jan 2017 19:13:59 -0600 Subject: [PATCH 2/2] Error message more like original --- src/librustc_driver/driver.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 536728308b03d..e3a6224c77e38 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -1337,8 +1337,8 @@ pub fn build_output_filenames(input: &Input, .count(); let ofile = if unnamed_output_types > 1 && sess.opts.output_types.contains_key(&OutputType::Exe) { - sess.warn("ignoring output name requested with -o for \"link\" output because \ - multiple outputs were requested"); + sess.warn("ignoring specified output filename for 'link' output because multiple \ + outputs were requested"); None } else { Some(out_file.clone())