Clarify that no output means no flags are missing.

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index 4c5973631e1f016bc2d0f9f7ded47ed8c9783a24..21681109a1bbf4d4f15823affa949aa32342f295 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -744,10 +744,18 @@ foreach my $file (@ARGV) {
                                 [Cc]ompiler[\s.]*:?\s+
                                 /xo;
             next if $line =~ /^\s*(?:- )?(?:HOST_)?(?:CC|CXX)\s*=\s*$cc_regex_full\s*$/o;
+            # `moc-qt4`, contains '-I/usr/share/qt4/mkspecs/linux-g++' (or
+            # similar for other architectures) which gets recognized as a
+            # compiler line. Ignore it.
+            next if $line =~ m{^/usr/bin/moc-qt4
+                               \s.+\s
+                               -I/usr/share/qt4/mkspecs/[a-z]+-g\++(?:-64)?
+                               \s}x;
 
             # Check if additional hardening options were used. Used to ensure
             # they are used for the complete build.
-            $harden_pie     = 1 if any_flags_used($line, @def_cflags_pie, @def_ldflags_pie);
+            $harden_pie     = 1 if any_flags_used($line, @def_cflags_pie,
+                                                         @def_ldflags_pie);
             $harden_bindnow = 1 if any_flags_used($line, @def_ldflags_bindnow);
 
             push @input, $line;
@@ -1055,7 +1063,7 @@ blhc - build log hardening check, checks build logs for missing hardening flags
 
 =head1 SYNOPSIS
 
-B<blhc> [I<options>] I<E<lt>dpkg-buildpackage build log fileE<gt>..>
+B<blhc> [I<options>] I<< <dpkg-buildpackage build log file>.. >>
 
 =head1 DESCRIPTION
 
@@ -1066,6 +1074,8 @@ It's designed to check build logs generated by Debian's dpkg-buildpackage (or
 tools using dpkg-buildpackage like pbuilder or the official buildd build logs)
 to help maintainers detect missing hardening flags in their packages.
 
+If there's no output, no flags are missing and the build log is fine.
+
 =head1 OPTIONS
 
 =over 8
@@ -1167,6 +1177,8 @@ Normal usage, parse a single log file.
 
     blhc path/to/log/file
 
+If there's no output, no flags are missing and the build log is fine.
+
 Parse multiple log files. The exit code is ORed over all files.
 
     blhc path/to/directory/with/log/files/*