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

diff --git a/bin/blhc b/bin/blhc
index 73548dc..383fcc1 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.
             #
@@ -271,8 +271,9 @@ foreach my $line (@input) {
 
     # 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|\\|\$)}
             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;
     }