Skip to content

Commit 7326737

Browse files
Use custom cargo/rustc paths when parsing flags.
1 parent 16c27bf commit 7326737

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/bootstrap/flags.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,18 @@ Arguments:
242242
let cwd = t!(env::current_dir());
243243
let paths = matches.free[1..].iter().map(|p| cwd.join(p)).collect::<Vec<_>>();
244244

245+
let cfg_file = matches.opt_str("config").map(PathBuf::from).or_else(|| {
246+
if fs::metadata("config.toml").is_ok() {
247+
Some(PathBuf::from("config.toml"))
248+
} else {
249+
None
250+
}
251+
});
245252

246253
// All subcommands can have an optional "Available paths" section
247254
if matches.opt_present("verbose") {
248255
let flags = Flags::parse(&["build".to_string()]);
249-
let mut config = Config::default();
256+
let mut config = Config::parse(&flags.build, cfg_file.clone());
250257
config.build = flags.build.clone();
251258
let mut build = Build::new(flags, config);
252259
metadata::build(&mut build);
@@ -307,14 +314,6 @@ Arguments:
307314
};
308315

309316

310-
let cfg_file = matches.opt_str("config").map(PathBuf::from).or_else(|| {
311-
if fs::metadata("config.toml").is_ok() {
312-
Some(PathBuf::from("config.toml"))
313-
} else {
314-
None
315-
}
316-
});
317-
318317
let mut stage = matches.opt_str("stage").map(|j| j.parse().unwrap());
319318

320319
if matches.opt_present("incremental") {

0 commit comments

Comments
 (0)