From c52fb52fbcb57ef8eb9f2e5782339b9e72cc81f8 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 29 Apr 2011 10:23:07 -0700
Subject: [PATCH] rustc: Remove the wrong-compiler warning; we're self-hosting
 now.

---
 Makefile.in              |  4 ++--
 src/comp/driver/rustc.rs | 13 +------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 2c33bbb28bc..2c6e4521219 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,9 +16,9 @@ CFG_GCC_LINK_FLAGS :=
 CFG_BOOT_FLAGS := $(BOOT_FLAGS)
 ifdef CFG_DISABLE_OPTIMIZE
   $(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE))
-  CFG_RUSTC_FLAGS := --nowarn
+  CFG_RUSTC_FLAGS :=
 else
-  CFG_RUSTC_FLAGS := --nowarn -O
+  CFG_RUSTC_FLAGS := -O
 endif
 
 ifdef SAVE_TEMPS
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 99c736025db..db385c8e04d 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -98,19 +98,11 @@ fn pretty_print_input(session.session sess,
     pretty.pprust.print_file(crate.node.module, input, std.io.stdout());
 }
 
-fn warn_wrong_compiler() {
-    io.stdout().write_str("This is the rust 'self-hosted' compiler.
-The one written in rust.
-It is currently incomplete.
-You may want rustboot instead, the compiler next door.\n");
-}
-
 fn usage(session.session sess, str argv0) {
     io.stdout().write_str(#fmt("usage: %s [options] <input>\n", argv0) + "
 options:
 
     -o <filename>      write output to <filename>
-    --nowarn           suppress wrong-compiler warning
     --glue             generate glue.bc file
     --shared           compile a shared-library crate
     --pretty           pretty-print the input instead of compiling
@@ -147,7 +139,7 @@ fn main(vec[str] args) {
     auto sess = session.session(target_crate_num, target_cfg, crate_cache,
                                 md, front.codemap.new_codemap());
 
-    auto opts = vec(optflag("nowarn"), optflag("h"), optflag("glue"),
+    auto opts = vec(optflag("h"), optflag("glue"),
                     optflag("pretty"), optflag("ls"), optflag("parse-only"),
                     optflag("O"), optflag("shared"), optmulti("L"),
                     optflag("S"), optflag("c"), optopt("o"),
@@ -158,9 +150,6 @@ fn main(vec[str] args) {
         case (GetOpts.failure(?f)) { sess.err(GetOpts.fail_str(f)); fail; }
         case (GetOpts.success(?m)) { match = m; }
     }
-    if (!opt_present(match, "nowarn")) {
-        warn_wrong_compiler();
-    }
     if (opt_present(match, "h")) {
         usage(sess, binary);
         ret;