about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-02-09 19:43:20 -0500
committerGitHub <noreply@github.com>2017-02-09 19:43:20 -0500
commit41653fd26a0124f74665e0c87221afd4e7333c24 (patch)
tree40804a8415d3d99e6e8772fe2d2f4297a5cb12f6
parent24a70eb598a76edb0941f628a87946b40f2a1c83 (diff)
parentec73ef9dc85b7b1cb986eb7c85fc8093cc668f60 (diff)
downloadrust-41653fd26a0124f74665e0c87221afd4e7333c24.tar.gz
rust-41653fd26a0124f74665e0c87221afd4e7333c24.zip
Rollup merge of #39587 - Keruspe:master, r=alexcrichton
rustbuild: support setting verbosity in config.toml

Most if not all the configuration is settable trhough config.toml but the verbosity isn't yet.

This avoids having to pass -v to x.py on each command if you want verbosity to be always on.
-rw-r--r--src/bootstrap/config.rs2
-rw-r--r--src/bootstrap/config.toml.example3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 604c0397d52..47f505ad37e 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -150,6 +150,7 @@ struct Build {
     python: Option<String>,
     full_bootstrap: Option<bool>,
     extended: Option<bool>,
+    verbose: Option<usize>,
     sanitizers: Option<bool>,
 }
 
@@ -296,6 +297,7 @@ impl Config {
         set(&mut config.vendor, build.vendor);
         set(&mut config.full_bootstrap, build.full_bootstrap);
         set(&mut config.extended, build.extended);
+        set(&mut config.verbose, build.verbose);
         set(&mut config.sanitizers, build.sanitizers);
 
         if let Some(ref install) = toml.install {
diff --git a/src/bootstrap/config.toml.example b/src/bootstrap/config.toml.example
index 025fe990f91..5f4303a728c 100644
--- a/src/bootstrap/config.toml.example
+++ b/src/bootstrap/config.toml.example
@@ -124,6 +124,9 @@
 # disabled by default.
 #extended = false
 
+# Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
+#verbose = 0
+
 # Build the sanitizer runtimes
 #sanitizers = false