From 0b07f6f5d32d6a46de21776eac714e0a04fce71d Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 2 Apr 2020 09:49:48 +0200
Subject: [PATCH] set CARGO_INCREMENTAL=0 on CI, it's just a waste of time
 there

---
 .appveyor.yml | 1 +
 .travis.yml   | 1 +
 miri          | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e5c2f4fb729..294ef26be0b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -46,6 +46,7 @@ build_script:
 test_script:
     - set RUST_TEST_NOCAPTURE=1
     - set RUST_BACKTRACE=1
+    - set CARGO_INCREMENTAL=0
     # Test host miri: 32bit Windows
     - cargo miri setup
     - set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\rust-lang\miri\cache\HOST
diff --git a/.travis.yml b/.travis.yml
index 137ae4fe662..a074d6b14d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ env:
   global:
   - RUST_TEST_NOCAPTURE=1
   - RUST_BACKTRACE=1
+  - CARGO_INCREMENTAL=0
 
 before_script:
 # Compute the rust version we use. We do not use "language: rust" to have more control here.
diff --git a/miri b/miri
index 0cda9e80926..8cd2cfc3ae0 100755
--- a/miri
+++ b/miri
@@ -49,7 +49,10 @@ fi
 # We enable debug-assertions to get tracing.
 # We enable line-only debuginfo for backtraces.
 export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR -C debug-assertions -C debuginfo=1 $RUSTC_EXTRA_FLAGS"
-export CARGO_INCREMENTAL=1
+if [ -z "$CARGO_INCREMENTAL" ]; then
+    # Default CARGO_INCREMENTAL to 1.
+    export CARGO_INCREMENTAL=1
+fi
 
 ## Helper functions