X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=03e8ebfb8b90da4f1472619c05ef7c756aa304be;hp=d966f9340248c5331157568f1fe2673f852d99cb;hb=99243a356c2d5a818b8d1bffb354cd38d2424146;hpb=4d6308c34fb0182db05846df83118bb83ad5497d

diff --git a/bin/blhc b/bin/blhc
index d966f93..03e8ebf 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -44,7 +44,7 @@ sub error_flags {
            error_color($message, 'red'), $flags, error_color(':', 'yellow'),
            $line;
 }
-sub error_nonverbose_build {
+sub error_non_verbose_build {
     my ($line) = @_;
 
     printf "%s%s %s",
@@ -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;
         }
     }
@@ -112,9 +112,48 @@ sub pic_pie_conflict {
     return scalar @result == 0;
 }
 
+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/)) {
+        return 0;
+    }
+
+    # 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/) {
+        # 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;
+
+        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
+            # compiler commands.
+            ${$skip_ref} = 1;
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
 
 # CONSTANTS/VARIABLES
 
+# Regex to catch compiler commands.
+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: (.+?) \[(.+?)\]$/;
 
@@ -214,15 +253,8 @@ while (my $line = <>) {
     # Ignore compiler warnings for now.
     next if $line =~ /$warning_regex/;
 
-    # Try to detect non verbose build logs.
-    if ($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 =~ /^\s*\[[\d ]+%\] Building /) {
-        error_nonverbose_build($line);
-        $exit |= 1 << 2;
-    }
-
+    # Check if this line indicates a non verbose build.
+    my $non_verbose = is_non_verbose_build($line);
 
     # One line may contain multiple commands (";"). Treat each one as single
     # line.
@@ -242,14 +274,12 @@ while (my $line = <>) {
 
         } else {
             # Ignore lines with no compiler commands.
-            next if $line !~ /\b((?<!\.)cc|gcc|g\+\+|c\+\+)(\s|\\)/;
+            next if $line !~ /\b$cc_regex(?:\s|\\)/ and not $non_verbose;
 
             # Ignore false positives.
             #
             # `./configure` output.
-            if ($line =~ /^checking /) {
-                next;
-            }
+            next if not $non_verbose and $line =~ /^checking /;
 
             push @input, $line;
         }
@@ -282,27 +312,37 @@ if ($bindnow) {
     @ldflags = (@ldflags, @ldflags_bindnow);
 }
 
-foreach my $line (@input) {
+for (my $i = 0; $i < scalar @input; $i++) {
+    my $line = $input[$i];
+
+    my $skip = 0;
+    if (is_non_verbose_build($line, $input[$i + 1], $cc_regex, \$skip)) {
+        error_non_verbose_build($line);
+        $exit |= 1 << 2;
+        next;
+    }
+    # Even if it's a verbose build, we might have to skip this line.
+    next if $skip;
+
     # Ignore false positives.
     #
     # ./configure summary.
-    my $cc_regex = qr/(cc|(x86_64-linux-gnu-)?gcc|g\+\+|c\+\+)/;
-    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}) {
@@ -312,7 +352,7 @@ foreach my $line (@input) {
 
     # 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;
     }