about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2017-11-16 01:01:18 +0800
committerkennytm <kennytm@gmail.com>2017-11-16 01:06:53 +0800
commit3d791d29b879c21cbbc31a60e35d16a877eb56dc (patch)
tree5b525b06ff1644f0bc163e32c3ed2cabc8df25cc
parentcd57b761ce0670920fcdbe3a3e79b1bb4807d11e (diff)
downloadrust-3d791d29b879c21cbbc31a60e35d16a877eb56dc.tar.gz
rust-3d791d29b879c21cbbc31a60e35d16a877eb56dc.zip
In additional to segfault, retry the linker on bus error as well.
-rw-r--r--src/librustc_trans/back/link.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
index 1d2bfd001f1..de2d8f8e0ba 100644
--- a/src/librustc_trans/back/link.rs
+++ b/src/librustc_trans/back/link.rs
@@ -644,9 +644,9 @@ fn link_natively(sess: &Session,
         let mut out = output.stderr.clone();
         out.extend(&output.stdout);
         let out = String::from_utf8_lossy(&out);
-        let msg = "clang: error: unable to execute command: \
-                   Segmentation fault: 11";
-        if !out.contains(msg) {
+        let msg_segv = "clang: error: unable to execute command: Segmentation fault: 11";
+        let msg_bus  = "clang: error: unable to execute command: Bus error: 10";
+        if !(out.contains(msg_segv) || out.contains(msg_bus)) {
             break
         }