48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 73267374d4176ac1c5d685ff2bac36556cfa4730 Mon Sep 17 00:00:00 2001
|
|
From: Mark Simulacrum <mark.simulacrum@gmail.com>
|
|
Date: Fri, 16 Jun 2017 07:44:09 -0600
|
|
Subject: [PATCH] Use custom cargo/rustc paths when parsing flags.
|
|
|
|
---
|
|
src/bootstrap/flags.rs | 17 ++++++++---------
|
|
1 file changed, 8 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
|
|
index 56cbb4cecf2a..dc9dac736278 100644
|
|
--- a/src/bootstrap/flags.rs
|
|
+++ b/src/bootstrap/flags.rs
|
|
@@ -242,11 +242,18 @@ Arguments:
|
|
let cwd = t!(env::current_dir());
|
|
let paths = matches.free[1..].iter().map(|p| cwd.join(p)).collect::<Vec<_>>();
|
|
|
|
+ let cfg_file = matches.opt_str("config").map(PathBuf::from).or_else(|| {
|
|
+ if fs::metadata("config.toml").is_ok() {
|
|
+ Some(PathBuf::from("config.toml"))
|
|
+ } else {
|
|
+ None
|
|
+ }
|
|
+ });
|
|
|
|
// All subcommands can have an optional "Available paths" section
|
|
if matches.opt_present("verbose") {
|
|
let flags = Flags::parse(&["build".to_string()]);
|
|
- let mut config = Config::default();
|
|
+ let mut config = Config::parse(&flags.build, cfg_file.clone());
|
|
config.build = flags.build.clone();
|
|
let mut build = Build::new(flags, config);
|
|
metadata::build(&mut build);
|
|
@@ -307,14 +314,6 @@ Arguments:
|
|
};
|
|
|
|
|
|
- let cfg_file = matches.opt_str("config").map(PathBuf::from).or_else(|| {
|
|
- if fs::metadata("config.toml").is_ok() {
|
|
- Some(PathBuf::from("config.toml"))
|
|
- } else {
|
|
- None
|
|
- }
|
|
- });
|
|
-
|
|
let mut stage = matches.opt_str("stage").map(|j| j.parse().unwrap());
|
|
|
|
if matches.opt_present("incremental") {
|