X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=6fb0f21b491ebbd7b4cb4592ea82416e60bcc64d;hb=b7365f756ee0d81d1d5b7286f09c9dfc5b6fe892;hp=47d464c1b9b66f752bbf3e2a7ac54e75f957ff1d;hpb=1ba912b03dd1df9a4068b567939ea2d100c56f20;p=blhc%2Fblhc.git

diff --git a/bin/blhc b/bin/blhc
index 47d464c..6fb0f21 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -44,6 +44,14 @@ sub error_flags {
            error_color($message, 'red'), $flags, error_color(':', 'yellow'),
            $line;
 }
+sub error_nonverbose_build {
+    my ($line) = @_;
+
+    printf "%s%s %s",
+           error_color('NONVERBOSE BUILD', 'red'),
+           error_color(':', 'yellow'),
+           $line;
+}
 sub error_color {
     my ($message, $color) = @_;
 
@@ -107,6 +115,9 @@ sub pic_pie_conflict {
 
 # CONSTANTS/VARIABLES
 
+# Regex to catch compiler commands.
+my $cc_regex = qr/((?<!\.)cc|(x86_64-linux-gnu-)?gcc|g\+\+|c\+\+)/;
+
 # Regex to catch (GCC) compiler warnings.
 my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/;
 
@@ -206,6 +217,16 @@ 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;
+    }
+
+
     # One line may contain multiple commands (";"). Treat each one as single
     # line.
     my @line = split /(?<!\\);/, $line;
@@ -224,7 +245,7 @@ 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|\\)/;
 
             # Ignore false positives.
             #
@@ -268,7 +289,6 @@ foreach my $line (@input) {
     # 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: /;
@@ -305,17 +325,17 @@ foreach my $line (@input) {
             # with -fPIE as well. It's no error if only PIE flags are missing.
             and not pic_pie_conflict($line, $pie, \@missing, @cflags_pie)) {
         error_flags('CFLAGS missing', \@missing, \%flag_renames, $line);
-        $exit |= 1 << 2;
+        $exit |= 1 << 3;
     }
     if ($compiler and not all_flags_used($line, \@missing, @cppflags)) {
         error_flags('CPPFLAGS missing', \@missing, \%flag_renames, $line);
-        $exit |= 1 << 2;
+        $exit |= 1 << 3;
     }
     if ($linker and not all_flags_used($line, \@missing, @ldflags)
             # Same here, -fPIC conflicts with -fPIE.
             and not pic_pie_conflict($line, $pie, \@missing, @ldflags_pie)) {
         error_flags('LDFLAGS missing', \@missing, \%flag_renames, $line);
-        $exit |= 1 << 2;
+        $exit |= 1 << 3;
     }
 }
 
@@ -396,6 +416,10 @@ Invalid arguments/options given to blhc.
 
 =item B<4>
 
+Non verbose build.
+
+=item B<8>
+
 Missing hardening flags.
 
 =back