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
This commit is contained in:
Alex Crichton 2015-02-11 14:02:19 -08:00
commit 76a3852b72
3 changed files with 1 additions and 9 deletions

View File

@ -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
}

View File

@ -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