diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
index e9c14b4f99c..536728308b0 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())