rollup merge of #22184: nagisa/revert-emissions

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

r? @alexcrichton

3 files changed, 1 insertions, 9 deletions

diff --git a/src/librustc/middle/entry.rs b/src/librustc/middle/entry.rs
index b5904f23ef3..0ce9db1c80f 100644
--- 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
index f55a2cc3bb1..00000000000
--- 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
index e69de29bb2d..00000000000
--- a/src/test/run-make/empty-file/empty.rs
+++ /dev/null