Detect LINK non-verbose builds.

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index 2c439bb0f33003817eb0fd8e1c7be09a33def19a..7075ec812c7076485866279e4258fe03999a6c30 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -119,7 +119,7 @@ sub any_flags_used {
     my ($line, @flags) = @_;
 
     foreach my $flag (@flags) {
-        return 1 if $line =~ /\s$flag(?:\s|\\|$)/;
+        return 1 if $line =~ /\s$flag(?:\s|\\)/;
     }
 
     return 0;
@@ -129,14 +129,12 @@ sub all_flags_used {
 
     my @missing_flags = ();
     foreach my $flag (@flags) {
-        if ($line !~ /\s$flag(?:\s|\\|$)/) {
+        if ($line !~ /\s$flag(?:\s|\\)/) {
             push @missing_flags, $flag;
         }
     }
 
-    if (scalar @missing_flags == 0) {
-        return 1;
-    }
+    return 1 if scalar @missing_flags == 0;
 
     @{$missing_flags_ref} = @missing_flags;
     return 0;
@@ -168,7 +166,7 @@ sub is_non_verbose_build {
     my ($line, $next_line, $skip_ref) = @_;
 
     if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/
-                or $line =~ /^\s*\[?(?:CC|CCLD|CXX|CXXLD|LD)\]?\s+(.+?)$/
+                or $line =~ /^\s*\[?(?:CC|CCLD|CXX|CXXLD|LD|LINK)\]?\s+(.+?)$/
                 or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/
                 or $line =~ /^\s*(?:B|b)uilding (?:program|shared library)\s+(.+?)$/
                 or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) {
@@ -292,8 +290,8 @@ while (my $line = <>) {
         }
     }
 
-    # We skip over unimportant lines at the beginning to prevent false
-    # positives.
+    # We skip over unimportant lines at the beginning of the log to prevent
+    # false positives.
     $start = 1 if $line =~ /^dpkg-buildpackage:/;
     next if not $start;
 
@@ -309,7 +307,7 @@ while (my $line = <>) {
     # Remove all ANSI color sequences which are sometimes used in non-verbose
     # builds.
     $line = Term::ANSIColor::colorstrip($line);
-    # Also strip '\0xf' (delete previous character), used by Elink's build
+    # Also strip '\0xf' (delete previous character), used by Elinks' build
     # system.
     $line =~ s/\x0f//g;
     # And "ESC(B" which seems to be used on armhf and hurd (not sure what it