diff options
| author | Simonas Kazlauskas <git@kazlauskas.me> | 2015-02-11 19:23:06 +0200 |
|---|---|---|
| committer | Simonas Kazlauskas <git@kazlauskas.me> | 2015-02-11 19:28:02 +0200 |
| commit | 2f486511112afcfe6894d16fd1c5e7eec38ebc6c (patch) | |
| tree | caf5c0fbe2ceb991d72bc4d7f3d22bbe35987390 | |
| parent | 1500df8934431dd7842827209528211ae53ded12 (diff) | |
| download | rust-2f486511112afcfe6894d16fd1c5e7eec38ebc6c.tar.gz rust-2f486511112afcfe6894d16fd1c5e7eec38ebc6c.zip | |
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.
| -rw-r--r-- | src/librustc/middle/entry.rs | 5 | ||||
| -rw-r--r-- | src/test/run-make/empty-file/Makefile | 5 | ||||
| -rw-r--r-- | src/test/run-make/empty-file/empty.rs | 0 |
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 |