auto merge of #8279 : pcwalton/rust/no-main, r=brson

[rust.git] / src / librustc / middle / entry.rs

diff --git a/src/librustc/middle/entry.rs b/src/librustc/middle/entry.rs
index 1bf5c944fabb00e0b8c5c34756d37f98ffb7b62a..34aeaf8a6cebec8fdff7622bf60eee665d54b07c 100644 (file)
--- a/src/librustc/middle/entry.rs
+++ b/src/librustc/middle/entry.rs
@@ -50,6 +50,12 @@ pub fn find_entry_point(session: Session, crate: &Crate, ast_map: ast_map::map)
         return;
     }
 
+    // If the user wants no main function at all, then stop here.
+    if attr::contains_name(crate.attrs, "no_main") {
+        *session.entry_type = Some(session::EntryNone);
+        return
+    }
+
     let ctxt = @mut EntryContext {
         session: session,
         ast_map: ast_map,