From 4f35166f8091bfd0767f907a558d6e66d3afd492 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 15 Aug 2019 13:45:20 -0700 Subject: [PATCH] bootstrap: Move `RUSTC_BREAK_ON_ICE` out of shim This is always set, so let's just always set it elsewhere to reduce the need for our `rustc.rs` shim. --- src/bootstrap/bin/rustc.rs | 2 -- src/bootstrap/builder.rs | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index e6102de1874..efbfc3796ae 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -97,8 +97,6 @@ fn main() { cmd.env("RUST_BACKTRACE", "1"); } - cmd.env("RUSTC_BREAK_ON_ICE", "1"); - if let Ok(debuginfo_level) = env::var("RUSTC_DEBUGINFO_LEVEL") { cmd.arg(format!("-Cdebuginfo={}", debuginfo_level)); } diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 6323fa94ccf..0704ff3ca9b 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -917,7 +917,8 @@ impl<'a> Builder<'a> { PathBuf::from("/path/to/nowhere/rustdoc/not/required") }, ) - .env("RUSTC_ERROR_METADATA_DST", self.extended_error_dir()); + .env("RUSTC_ERROR_METADATA_DST", self.extended_error_dir()) + .env("RUSTC_BREAK_ON_ICE", "1"); if let Some(host_linker) = self.linker(compiler.host) { cargo.env("RUSTC_HOST_LINKER", host_linker);