Skip to content

Commit 5ac7e08

Browse files
committed
Auto merge of #103786 - tshepang:obsolete, r=jyn514
Don't build `compiler_builtins` with `-C panic=abort`
2 parents 0e9eee6 + b21674f commit 5ac7e08

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/bootstrap/bin/rustc.rs

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

0 commit comments

Comments
 (0)