Accept libraries which end with a character (e.g. .so.0d).

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index 383fcc15f06b0d0a3ea750d6104e4d9357fbd023..d662283e4b9a2e2e0f768fee4e8bd158954f934b 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -265,13 +265,23 @@ 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|\\|$)/
-            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!)
+                   (\.so[0-9.]*[a-z]?|\.la)? # library (including version)
+                   (\s|\\|\$)            # end of file name
+                  }x
             or $line =~ /^libtool: link: /
             or $line =~ m{\s*/bin/bash .+?libtool\s+(.+?\s+)?--mode=(re)?link}) {
         $compiler = 0;