Support non-verbose messages in verbose build for other build systems.

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index ea8291fe7caad3221b33d791e37d1fb807d40e3f..f5fbfb8f3250d3843b4e61d714dfd475c57c7f4d 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -115,28 +115,30 @@ sub pic_pie_conflict {
 sub is_non_verbose_build {
     my ($line, $next_line, $cc_regex, $skip_ref) = @_;
 
-    my $cmake_non_verbose = qr/^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/;
     if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/
-                or $line =~ /^\s*(?:CC|CCLD)\s+/
-                or $line =~ /^\s*(?:C|c)ompiling\s+/
-                or $line =~ /$cmake_non_verbose/)) {
+                or $line =~ /^\s*(?:CC|CCLD)\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 (.+?)$/)) {
         return 0;
     }
 
+    my $file = $1;
+
     # On the first pass we only check if this line is verbose or not.
     return 1 if not defined $next_line;
 
     # Second pass, we have access to the next line.
     ${$skip_ref} = 0;
 
-    # CMake prints the non-verbose messages also when building verbose. If a
-    # compiler and the file name occurs in the next line, treat it as verbose
-    # build.
-    if ($line =~ /$cmake_non_verbose/) {
+    # CMake and other build systems print the non-verbose messages also when
+    # building verbose. If a compiler and the file name occurs in the next
+    # line, treat it as verbose build.
+    if (defined $file) {
         # Get filename, we can't use the complete path as only parts of it are
-        # used in the real compiler command ...
-        $1 =~ m{/([a-zA-Z0-9._-]+)$};
-        my $file = $1;
+        # used in the real compiler command.
+        $file =~ m{/([a-zA-Z0-9._-]+)$};
+        $file = $1;
 
         if ($next_line =~ /\Q$file\E/ and $next_line =~ /$cc_regex/) {
             # We still have to skip the current line as it doesn't contain any