From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sun, 17 Oct 2021 13:29:57 +0000 (+0200)
Subject: Re-enable incremental compilation for the sysroot
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=1e5569d62c31743cec29daa97fb527a64c93914f;p=rust.git

Re-enable incremental compilation for the sysroot

rust-lang/rust#74946 for fixed
---

diff --git a/build_system/build_sysroot.rs b/build_system/build_sysroot.rs
index 642abc41f45..9a5430a606b 100644
--- a/build_system/build_sysroot.rs
+++ b/build_system/build_sysroot.rs
@@ -193,8 +193,6 @@ fn build_clif_sysroot_for_triple(
         "RUSTC",
         env::current_dir().unwrap().join(target_dir).join("bin").join("cg_clif_build_sysroot"),
     );
-    // FIXME Enable incremental again once rust-lang/rust#74946 is fixed
-    build_cmd.env("CARGO_INCREMENTAL", "0").env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif");
     spawn_and_wait(build_cmd);
 
     // Copy all relevant files to the sysroot