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 813936890b9369de332a6a9648bff06c6e9a05ba..f5fbfb8f3250d3843b4e61d714dfd475c57c7f4d 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -67,7 +67,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;
@@ -77,7 +77,7 @@ 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;
         }
     }
@@ -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 ...
-        $2 =~ 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
@@ -153,7 +155,7 @@ sub is_non_verbose_build {
 # CONSTANTS/VARIABLES
 
 # Regex to catch compiler commands.
-my $cc_regex = qr/((?<!\.)cc|(x86_64-linux-gnu-)?gcc|g\+\+|c\+\+)/;
+my $cc_regex = qr/(?:x86_64-linux-gnu-)?(?:(?<!\.)cc|gcc|g\+\+|c\+\+)(?:-[\d.]+)?/;
 # Regex to catch (GCC) compiler warnings.
 my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/;
 
@@ -274,7 +276,7 @@ while (my $line = <>) {
 
         } else {
             # Ignore lines with no compiler commands.
-            next if $line !~ /\b$cc_regex(\s|\\)/ and not $non_verbose;
+            next if $line !~ /\b$cc_regex(?:\s|\\)/ and not $non_verbose;
 
             # Ignore false positives.
             #
@@ -327,22 +329,22 @@ for (my $i = 0; $i < scalar @input; $i++) {
     # Ignore false positives.
     #
     # ./configure summary.
-    next if $line =~ /^\s*(C|c)ompiler[\s.]*:\s+$cc_regex(\s-std=[a-z0-9:+]+)?\s*$/
-            or $line =~ /^\s*- (CC|CXX)\s*=\s*$cc_regex\s*$/
-            or $line =~ /^\s*-- Check for working (C|CXX) compiler: /;
+    next if $line =~ /^\s*(?:C|c)ompiler[\s.]*:\s+$cc_regex(?:\s-std=[a-z0-9:+]+)?\s*$/
+            or $line =~ /^\s*- (?:CC|CXX)\s*=\s*$cc_regex\s*$/
+            or $line =~ /^\s*-- Check for working (?:C|CXX) compiler: /;
 
     # Is this a compiler or linker command?
     my $compiler = 1;
     my $linker   = 0;
 
     # Linker commands.
-    if ($line =~ m{\s-o                      # -o
-                   [\s\\]*\s+                # possible line continuation
-                   ([A-Za-z0-9_/.-]+/)?      # path to file
-                   [A-Za-z0-9_-]+            # binary name (no dots!)
-                   ([0-9.]*\.so[0-9.]*[a-z]? # library (including version)
+    if ($line =~ m{\s-o                        # -o
+                   [\s\\]*\s+                  # possible line continuation
+                   (?:[/.A-Za-z0-9~_-]+/)?     # path to file
+                        [A-Za-z0-9~_-]+        # binary name (no dots!)
+                   (?:[0-9.]*\.so[0-9.]*[a-z]? # library (including version)
                     |\.la)?
-                   (\s|\\|\$)                # end of file name
+                   (?:\s|\\|$)                 # end of file name
                   }x
             or $line =~ /^libtool: link: /
             or $line =~ m{\s*/bin/bash .+?libtool\s+(.+?\s+)?--mode=(re)?link}) {
@@ -352,7 +354,7 @@ for (my $i = 0; $i < scalar @input; $i++) {
 
     # If there are source files then it's compiling/linking in one step and we
     # must check both.
-    if ($line =~ /\.(c|cc|cpp)\b/) {
+    if ($line =~ /\.(?:c|cc|cpp)\b/) {
         $compiler = 1;
     }