Accept libraries with version numbers before ".so".

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index 6f9107474c16daed7040ceca6f523e94e90e8d02..b2188eeb32d36d651da1860500444249c120cd62 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -275,7 +275,14 @@ foreach my $line (@input) {
     my $linker   = 0;
 
     # Linker commands.
-    if ($line =~ m{\s-o\s+(\\\s+)*([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;