From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Tue, 25 Jul 2017 21:19:47 +0000 (+0100)
Subject: u-fix-build_01
X-Git-Tag: archive/raspbian/1.19.0+dfsg3-4+rpi1~1^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=82e9710928aeed6bb4d0dcb9b3a8a6bab7213409;p=rustc.git

u-fix-build_01


Gbp-Pq: Name u-fix-build_01.patch
---

diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index 1ed759d24c..0b26a5c9a5 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -234,11 +234,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);
@@ -295,14 +302,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") {