Ignore more "./configure" false positives.

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index 030dd2128be0dfee9b34e066914949eb5d380700..47d464c1b9b66f752bbf3e2a7ac54e75f957ff1d 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -87,7 +87,7 @@ sub pic_pie_conflict {
     my ($line, $pie, $missing_flags_ref, @flags_pie) = @_;
 
     return 0 if not $pie;
-    return 0 if not any_flags_used($line, ('-fPIC'));
+    return 0 if not any_flags_used($line, ('-fPIC', '-fpic'));
 
     my %flags = map { $_ => 1 } @flags_pie;
 
@@ -224,7 +224,7 @@ while (my $line = <>) {
 
         } else {
             # Ignore lines with no compiler commands.
-            next if $line !~ /\b(cc\b|gcc\b|g\+\+|c\+\+)/;
+            next if $line !~ /\b(cc|gcc|g\+\+|c\+\+)(\s|\\)/;
 
             # Ignore false positives.
             #
@@ -265,13 +265,27 @@ if ($bindnow) {
 }
 
 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: /;
+
     # Is this a compiler or linker command?
     my $compiler = 1;
     my $linker   = 0;
 
     # Linker commands.
-    if ($line =~ /\s-l[A-Za-z0-9.-]+(\s|\\|$)/
-            or $line =~ m{\s-o ([A-Za-z0-9_/.-]+/)?[A-Za-z0-9_-]+(\.so([0-9.])*|\.la)?(\s|\\|\$)}
+    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
+                  }x
             or $line =~ /^libtool: link: /
             or $line =~ m{\s*/bin/bash .+?libtool\s+(.+?\s+)?--mode=(re)?link}) {
         $compiler = 0;