diff --git a/src/librustc/middle/entry.rs b/src/librustc/middle/entry.rs
index 0ce9db1c80f3f..b5904f23ef364 100644
--- a/src/librustc/middle/entry.rs
+++ b/src/librustc/middle/entry.rs
@@ -50,7 +50,10 @@ pub fn find_entry_point(session: &Session, ast_map: &ast_map::Map) {
     let any_exe = session.crate_types.borrow().iter().any(|ty| {
         *ty == config::CrateTypeExecutable
     });
-    if !any_exe {
+    let emit_link = session.opts.output_types.iter().any(|ty| {
+        *ty == config::OutputTypeExe
+    });
+    if !any_exe || !emit_link {
         // No need to find a main function
         return
     }
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index efd2392e453ed..f42b25b922953 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -82,7 +82,7 @@ pub struct Options {
     pub debuginfo: DebugInfoLevel,
     pub lint_opts: Vec<(String, lint::Level)>,
     pub describe_lints: bool,
-    pub output_types: Vec<OutputType> ,
+    pub output_types: Vec<OutputType>,
     // This was mutable for rustpkg, which updates search paths based on the
     // parsed code. It remains mutable in case its replacements wants to use
     // this.
diff --git a/src/test/run-make/empty-file/Makefile b/src/test/run-make/empty-file/Makefile
new file mode 100644
index 0000000000000..f55a2cc3bb158
--- /dev/null
+++ b/src/test/run-make/empty-file/Makefile
@@ -0,0 +1,5 @@
+-include ../tools.mk
+
+all:
+	$(RUSTC) --emit=asm,llvm-bc,llvm-ir,obj,dep-info empty.rs
+	$(RUSTC) --emit=link --crate-type=rlib,dylib,staticlib empty.rs
diff --git a/src/test/run-make/empty-file/empty.rs b/src/test/run-make/empty-file/empty.rs
new file mode 100644
index 0000000000000..e69de29bb2d1d