mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #103786 - tshepang:obsolete, r=jyn514

Browse Source 
Don't build `compiler_builtins` with `-C panic=abort`
This commit is contained in:
bors 2022-11-27 07:12:30 +00:00
commit 5ac7e08aaf
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bootstrap/bin/rustc.rs
View File

@ -97,13 +97,7 @@ fn main() {
// This... is a bit of a hack how we detect this. Ideally this
// information should be encoded in the crate I guess? Would likely
// require an RFC amendment to RFC 1513, however.
//
// `compiler_builtins` are unconditionally compiled with panic=abort to
// workaround undefined references to `rust_eh_unwind_resume` generated
// otherwise, see issue https://github.com/rust-lang/rust/issues/43095.
if crate_name == Some("panic_abort")
|| crate_name == Some("compiler_builtins") && stage != "0"
{
if crate_name == Some("panic_abort") {
cmd.arg("-C").arg("panic=abort");
}