diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-10-11 16:06:17 -0700 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-10-11 16:06:17 -0700 |
| commit | 72fc2b52dbbd45a2fe60fa383bbc44f8e516e281 (patch) | |
| tree | 11382fa3771dd59c1fd161ae99c6a6a4e521558a /src/rustc | |
| parent | ec6311211f70ad79dee75f94fa26851f2decfcb9 (diff) | |
| download | rust-72fc2b52dbbd45a2fe60fa383bbc44f8e516e281.tar.gz rust-72fc2b52dbbd45a2fe60fa383bbc44f8e516e281.zip | |
Remove unneeded no_rt flag
Diffstat (limited to 'src/rustc')
| -rw-r--r-- | src/rustc/back/link.rs | 6 | ||||
| -rw-r--r-- | src/rustc/driver/session.rs | 22 |
2 files changed, 11 insertions, 17 deletions
diff --git a/src/rustc/back/link.rs b/src/rustc/back/link.rs index 2e310785306..67edf6a32ba 100644 --- a/src/rustc/back/link.rs +++ b/src/rustc/back/link.rs @@ -723,10 +723,8 @@ fn link_binary(sess: session, } } - if !sess.debugging_opt(session::no_rt) { - // Always want the runtime linked in - cc_args.push(~"-lrustrt"); - } + // Always want the runtime linked in + cc_args.push(~"-lrustrt"); // On linux librt and libdl are an indirect dependencies via rustrt, // and binutils 2.22+ won't add them automatically diff --git a/src/rustc/driver/session.rs b/src/rustc/driver/session.rs index c6c0ff2826a..e6d5c404371 100644 --- a/src/rustc/driver/session.rs +++ b/src/rustc/driver/session.rs @@ -46,18 +46,15 @@ const trans_stats: uint = 1 << 4; const no_asm_comments: uint = 1 << 5; const no_verify: uint = 1 << 6; const trace: uint = 1 << 7; -// FIXME (#2377): This exists to transition to a Rust crate runtime -// It should be removed -const no_rt: uint = 1 << 8; -const coherence: uint = 1 << 9; -const borrowck_stats: uint = 1 << 10; -const borrowck_note_pure: uint = 1 << 11; -const borrowck_note_loan: uint = 1 << 12; -const no_landing_pads: uint = 1 << 13; -const debug_llvm: uint = 1 << 14; -const count_type_sizes: uint = 1 << 15; -const meta_stats: uint = 1 << 16; -const no_opt: uint = 1 << 17; +const coherence: uint = 1 << 8; +const borrowck_stats: uint = 1 << 9; +const borrowck_note_pure: uint = 1 << 10; +const borrowck_note_loan: uint = 1 << 11; +const no_landing_pads: uint = 1 << 12; +const debug_llvm: uint = 1 << 13; +const count_type_sizes: uint = 1 << 14; +const meta_stats: uint = 1 << 15; +const no_opt: uint = 1 << 16; fn debugging_opts_map() -> ~[(~str, ~str, uint)] { ~[(~"verbose", ~"in general, enable more debug printouts", verbose), @@ -70,7 +67,6 @@ fn debugging_opts_map() -> ~[(~str, ~str, uint)] { (~"no-asm-comments", ~"omit comments when using -S", no_asm_comments), (~"no-verify", ~"skip LLVM verification", no_verify), (~"trace", ~"emit trace logs", trace), - (~"no-rt", ~"do not link to the runtime", no_rt), (~"coherence", ~"perform coherence checking", coherence), (~"borrowck-stats", ~"gather borrowck statistics", borrowck_stats), (~"borrowck-note-pure", ~"note where purity is req'd", |