bootstrap rustc shim: Report a warning if on_fail command fails

ijackson · ijackson · commit 73365b261d33 · 2021-01-28T16:10:34.000Z
Signed-off-by: Ian Jackson &lt;ijackson@chiark.greenend.org.uk&gt;
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
@@ -179,7 +179,10 @@ fn main() {
     }
 
     if let Some(mut on_fail) = on_fail {
-        on_fail.status().expect("Could not run the on_fail command");
+        let status = on_fail.status().expect("Could not run the on_fail command");
+        if !status.success() {
+            eprintln!("\nwarning: the on-fail command also failed: {}\n", status);
+        }
     }
 
     // Preserve the exit code. In case of signal, exit with 0xfe since it's

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,10 @@ fn main() {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`if let Some(mut on_fail) = on_fail {`
`182`		`- on_fail.status().expect("Could not run the on_fail command");`
	`182`	`+ let status = on_fail.status().expect("Could not run the on_fail command");`
	`183`	`+ if !status.success() {`
	`184`	`+ eprintln!("\nwarning: the on-fail command also failed: {}\n", status);`
	`185`	`+ }`
`183`	`186`	`}`
`184`	`187`
`185`	`188`	`// Preserve the exit code. In case of signal, exit with 0xfe since it's`