diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-07-07 18:38:42 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-07-08 09:37:00 -0700 |
| commit | 58d288a4f7dcfac12e1fdf9d13eb594ef3c2b33e (patch) | |
| tree | bbb2e15296964d159d59f5248deb7178f0fdf453 /src/comp/driver | |
| parent | 4bfa269fe7ce48c7cd54404b4f74c48e0e7895ea (diff) | |
| download | rust-58d288a4f7dcfac12e1fdf9d13eb594ef3c2b33e.tar.gz rust-58d288a4f7dcfac12e1fdf9d13eb594ef3c2b33e.zip | |
Move used_link_args from session to cstore
Diffstat (limited to 'src/comp/driver')
| -rw-r--r-- | src/comp/driver/rustc.rs | 4 | ||||
| -rw-r--r-- | src/comp/driver/session.rs | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 27389e98762..bf62ce37d09 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -355,7 +355,7 @@ fn build_session(@session::options sopts) -> session::session { auto target_cfg = build_target_config(); auto cstore = cstore::mk_cstore(); ret session::session(target_cfg, sopts, cstore, - [], codemap::new_codemap(), 0u); + codemap::new_codemap(), 0u); } fn parse_pretty(session::session sess, &str name) -> pp_mode { @@ -527,7 +527,7 @@ fn main(vec[str] args) { gcc_args += ["-l" + libarg]; } - gcc_args += sess.get_used_link_args(); + gcc_args += cstore::get_used_link_args(cstore); auto used_libs = cstore::get_used_libraries(cstore); for (str l in used_libs) { gcc_args += ["-l" + l]; diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs index 8d28f9046ef..9d6aab7f56e 100644 --- a/src/comp/driver/session.rs +++ b/src/comp/driver/session.rs @@ -46,7 +46,6 @@ type crate_metadata = rec(str name, vec[u8] data); obj session(@config targ_cfg, @options opts, metadata::cstore::cstore cstore, - mutable vec[str] used_link_args, codemap::codemap cm, mutable uint err_count) { fn get_targ_cfg() -> @config { ret targ_cfg; } @@ -98,12 +97,6 @@ obj session(@config targ_cfg, self.span_bug(sp, "unimplemented " + msg); } fn unimpl(str msg) -> ! { self.bug("unimplemented " + msg); } - fn add_used_link_args(&str args) { - used_link_args += str::split(args, ' ' as u8); - } - fn get_used_link_args() -> vec[str] { - ret used_link_args; - } fn get_codemap() -> codemap::codemap { ret cm; } fn lookup_pos(uint pos) -> codemap::loc { ret codemap::lookup_pos(cm, pos); |
