diff --git a/llvm/utils/NightlyTest.pl b/llvm/utils/NightlyTest.pl
index 85dbae7f6c9ae0132bfa6bcbb7bfa100d78725d0..50756bf3f6ebeecb29b6112cc3a3bcd1d854cd9a 100755
--- a/llvm/utils/NightlyTest.pl
+++ b/llvm/utils/NightlyTest.pl
@@ -197,7 +197,8 @@ my $BuildTime  = $BuildTimeU+$BuildTimeS;  # BuildTime = User+System
 my $BuildWallTime = GetRegexNum "^real", 1, "([0-9.]+)","$Prefix-Build-Log.txt";
 
 my $BuildError = "";
-if (`grep '^gmake[^:]*: .*Error' $Prefix-Build-Log.txt | wc -l` + 0) {
+if (`grep '^gmake[^:]*: .*Error' $Prefix-Build-Log.txt | wc -l` + 0 ||
+    `grep '^gmake: \*\*\*.*Stop.`+0) {
   $BuildError = "<h3><font color='red'>Build error: compilation " .
                 "<a href=\"$DATE-Build-Log.txt\">aborted</a></font></h3>";
 }