Skip to content

Commit 3b9903c

Browse files
committed
---
yaml --- r: 2276 b: refs/heads/master c: c52fb52 h: refs/heads/master v: v3
1 parent c878108 commit 3b9903c

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: a2f68b2d585f0b467f0911d162f3cb9bc7d1ad14
2+
refs/heads/master: c52fb52fbcb57ef8eb9f2e5782339b9e72cc81f8

trunk/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ CFG_GCC_LINK_FLAGS :=
1616
CFG_BOOT_FLAGS := $(BOOT_FLAGS)
1717
ifdef CFG_DISABLE_OPTIMIZE
1818
$(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE))
19-
CFG_RUSTC_FLAGS := --nowarn
19+
CFG_RUSTC_FLAGS :=
2020
else
21-
CFG_RUSTC_FLAGS := --nowarn -O
21+
CFG_RUSTC_FLAGS := -O
2222
endif
2323

2424
ifdef SAVE_TEMPS

trunk/src/comp/driver/rustc.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,11 @@ fn pretty_print_input(session.session sess,
9898
pretty.pprust.print_file(crate.node.module, input, std.io.stdout());
9999
}
100100

101-
fn warn_wrong_compiler() {
102-
io.stdout().write_str("This is the rust 'self-hosted' compiler.
103-
The one written in rust.
104-
It is currently incomplete.
105-
You may want rustboot instead, the compiler next door.\n");
106-
}
107-
108101
fn usage(session.session sess, str argv0) {
109102
io.stdout().write_str(#fmt("usage: %s [options] <input>\n", argv0) + "
110103
options:
111104
112105
-o <filename> write output to <filename>
113-
--nowarn suppress wrong-compiler warning
114106
--glue generate glue.bc file
115107
--shared compile a shared-library crate
116108
--pretty pretty-print the input instead of compiling
@@ -147,7 +139,7 @@ fn main(vec[str] args) {
147139
auto sess = session.session(target_crate_num, target_cfg, crate_cache,
148140
md, front.codemap.new_codemap());
149141

150-
auto opts = vec(optflag("nowarn"), optflag("h"), optflag("glue"),
142+
auto opts = vec(optflag("h"), optflag("glue"),
151143
optflag("pretty"), optflag("ls"), optflag("parse-only"),
152144
optflag("O"), optflag("shared"), optmulti("L"),
153145
optflag("S"), optflag("c"), optopt("o"),
@@ -158,9 +150,6 @@ fn main(vec[str] args) {
158150
case (GetOpts.failure(?f)) { sess.err(GetOpts.fail_str(f)); fail; }
159151
case (GetOpts.success(?m)) { match = m; }
160152
}
161-
if (!opt_present(match, "nowarn")) {
162-
warn_wrong_compiler();
163-
}
164153
if (opt_present(match, "h")) {
165154
usage(sess, binary);
166155
ret;

0 commit comments

Comments
 (0)