Force panic=unwind for sysroot

rsmyth-ecmi · rsmyth-ecmi · commit 351578e05180 · 2024-02-23T17:29:19.000-05:00
diff --git a/cargo-miri/src/phases.rs b/cargo-miri/src/phases.rs
@@ -415,6 +415,9 @@ pub fn phase_rustc(mut args: impl Iterator<Item = String>, phase: RustcPhase) {
             && get_arg_flag_value("--crate-name").as_deref() == Some("panic_abort")
         {
             cmd.arg("-C").arg("panic=abort");
+        } else {
+            // If the user has a custom profile, this overrides it so that the sysroot is built properly.
+            cmd.arg("-C").arg("panic=unwind");
         }
     } else {
         // For host crates (but not when we are just printing some info),

Original file line number	Diff line number	Diff line change
`@@ -415,6 +415,9 @@ pub fn phase_rustc(mut args: impl Iterator<Item = String>, phase: RustcPhase) {`
`415`	`415`	`&& get_arg_flag_value("--crate-name").as_deref() == Some("panic_abort")`
`416`	`416`	`{`
`417`	`417`	`cmd.arg("-C").arg("panic=abort");`
	`418`	`+ } else {`
	`419`	`+ // If the user has a custom profile, this overrides it so that the sysroot is built properly.`
	`420`	`+ cmd.arg("-C").arg("panic=unwind");`
`418`	`421`	`}`
`419`	`422`	`} else {`
`420`	`423`	`// For host crates (but not when we are just printing some info),`