diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-06-27 13:32:04 -0600 |
|---|---|---|
| committer | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-07-04 07:31:56 -0600 |
| commit | 2cc5b084a0fdbd08ecc873be33bafd08d4faf273 (patch) | |
| tree | 9da7f6f297cb62649ad0d4d4cf92ad28d5d4e1bf /src/bootstrap/flags.rs | |
| parent | 743af95d4be6423a4123aa81bf587756d006ed9c (diff) | |
| download | rust-2cc5b084a0fdbd08ecc873be33bafd08d4faf273.tar.gz rust-2cc5b084a0fdbd08ecc873be33bafd08d4faf273.zip | |
Clarify meaning of Build.cargo, Build.rustc.
Rename Build.{cargo, rustc} to {initial_cargo, initial_rustc}.
Diffstat (limited to 'src/bootstrap/flags.rs')
| -rw-r--r-- | src/bootstrap/flags.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs index 1a73c489665..4541b6623c4 100644 --- a/src/bootstrap/flags.rs +++ b/src/bootstrap/flags.rs @@ -35,7 +35,7 @@ pub struct Flags { pub host: Vec<String>, pub target: Vec<String>, pub config: Option<PathBuf>, - pub src: Option<PathBuf>, + pub src: PathBuf, pub jobs: Option<u32>, pub cmd: Subcommand, pub incremental: bool, @@ -319,6 +319,11 @@ Arguments: stage = Some(1); } + let cwd = t!(env::current_dir()); + let src = matches.opt_str("src").map(PathBuf::from) + .or_else(|| env::var_os("SRC").map(PathBuf::from)) + .unwrap_or(cwd); + Flags { verbose: matches.opt_count("verbose"), stage: stage, @@ -330,7 +335,7 @@ Arguments: host: split(matches.opt_strs("host")), target: split(matches.opt_strs("target")), config: cfg_file, - src: matches.opt_str("src").map(PathBuf::from), + src: src, jobs: matches.opt_str("jobs").map(|j| j.parse().unwrap()), cmd: cmd, incremental: matches.opt_present("incremental"), |