X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=b2188eeb32d36d651da1860500444249c120cd62;hb=631bce18651ddfffb2702d7bb56556bb1b0359d2;hp=73548dc2a36ffc53a9adf3f69967f428f0285601;hpb=0df26c1c2b30a44adc06f9c93650a6f2e31475c0;p=blhc%2Fblhc.git

diff --git a/bin/blhc b/bin/blhc
index 73548dc..b2188ee 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -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,14 +265,26 @@ if ($bindnow) {
 }
 
 foreach my $line (@input) {
+    # Ignore false positives.
+    #
+    # ./configure summary.
+    next if $line =~ /^Compiler:\s+(cc|gcc|g\+\+|c\+\+)$/;
+
     # Is this a compiler or linker command?
     my $compiler = 1;
     my $linker   = 0;
 
     # Linker commands.
-    if ($line =~ /\s-l[A-Za-z0-9.-]+(\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+--tag=CC\s+--mode=link}) {
+            or $line =~ m{\s*/bin/bash .+?libtool\s+(.+?\s+)?--mode=(re)?link}) {
         $compiler = 0;
         $linker   = 1;
     }