Skip to content

Commit

Permalink
Auto merge of #49771 - tamird:incremental-no-stage-1, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Don't default to stage 1 with incremental

Closes #43177.

r? @Mark-Simulacrum
  • Loading branch information
bors committed Apr 8, 2018
2 parents 7327d9d + b204b49 commit b7da1aa
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/bootstrap/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -357,15 +357,9 @@ Arguments:
};


let mut stage = matches.opt_str("stage").map(|j| j.parse().unwrap());

if matches.opt_present("incremental") && stage.is_none() {
stage = Some(1);
}

Flags {
verbose: matches.opt_count("verbose"),
stage,
stage: matches.opt_str("stage").map(|j| j.parse().unwrap()),
dry_run: matches.opt_present("dry-run"),
on_fail: matches.opt_str("on-fail"),
rustc_error_format: matches.opt_str("error-format"),
Expand Down

0 comments on commit b7da1aa

Please sign in to comment.