squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

bootstrap: Move RUSTC_BREAK_ON_ICE out of shim

Browse source 
This is always set, so let's just always set it elsewhere to reduce the
need for our `rustc.rs` shim.
This commit is contained in:
Alex Crichton 2019-08-15 13:45:20 -07:00
parent 557e69b7ca
commit 4f35166f80
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/bin/rustc.rs
View file

@ -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));
}

3
src/bootstrap/builder.rs
View file

@ -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);