Revert #22051

This resulted in some very unexpected fallout such as empty llvm-ir, llvm-bc and asm in some cases.
See #22183 for related info.

diff --git a/src/librustc/middle/entry.rs b/src/librustc/middle/entry.rs
index b5904f23ef364e0e1d4a8d31bbd794efe269de9f..0ce9db1c80f3f21c4741083a46e983a4bb37ea23 100644 (file)
--- a/src/librustc/middle/entry.rs
+++ b/src/librustc/middle/entry.rs
@@ -50,10 +50,7 @@ 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
     });
-    let emit_link = session.opts.output_types.iter().any(|ty| {
-        *ty == config::OutputTypeExe
-    });
-    if !any_exe || !emit_link {
+    if !any_exe {
         // No need to find a main function
         return
     }

diff --git a/src/test/run-make/empty-file/Makefile b/src/test/run-make/empty-file/Makefile
deleted file mode 100644 (file)
index f55a2cc..0000000
--- a/src/test/run-make/empty-file/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
--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
deleted file mode 100644 (file)
index e69de29..0000000