about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Schneider <github35764891676564198441@oli-obk.de>2018-06-03 00:13:27 +0200
committerOliver Schneider <github35764891676564198441@oli-obk.de>2018-06-03 00:13:27 +0200
commit7a52f1c7cf659c62fbb89bd38d6e4fe4902622cc (patch)
treed7fa4557e3f7d8e327ac86864cf7d7f1f87ff6de
parentd830f46b77bbb97fbff6397f0d9c352a880f796d (diff)
downloadrust-7a52f1c7cf659c62fbb89bd38d6e4fe4902622cc.tar.gz
rust-7a52f1c7cf659c62fbb89bd38d6e4fe4902622cc.zip
Allow enabling incremental via config.toml
-rw-r--r--config.toml.example3
-rw-r--r--src/bootstrap/config.rs2
2 files changed, 5 insertions, 0 deletions
diff --git a/config.toml.example b/config.toml.example
index 33ad9147ce0..5054a8f44b9 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -279,6 +279,9 @@
 # Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
 #backtrace = true
 
+# Whether to always use incremental compilation when building rustc
+#incremental = false
+
 # Build rustc with experimental parallelization
 #experimental-parallel-queries = false
 
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 9840682d137..fbe9976b413 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -303,6 +303,7 @@ struct Rust {
     dist_src: Option<bool>,
     quiet_tests: Option<bool>,
     test_miri: Option<bool>,
+    incremental: Option<bool>,
     save_toolstates: Option<String>,
     codegen_backends: Option<Vec<String>>,
     codegen_backends_dir: Option<String>,
@@ -529,6 +530,7 @@ impl Config {
             set(&mut config.rust_dist_src, rust.dist_src);
             set(&mut config.quiet_tests, rust.quiet_tests);
             set(&mut config.test_miri, rust.test_miri);
+            set(&mut config.incremental, rust.incremental);
             set(&mut config.wasm_syscall, rust.wasm_syscall);
             set(&mut config.lld_enabled, rust.lld);
             config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false);