From: Simon Ruderich <simon@ruderich.org>
Date: Wed, 14 Mar 2012 01:03:12 +0000 (+0100)
Subject: Improve linker command detection.
X-Git-Tag: 0.01~129
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=1fa6ae0dfc6b1ddec3646e45baca2ebe5faef6f1;p=blhc%2Fblhc.git

Improve linker command detection.

-llib can be used in non linker commands as well.
---

diff --git a/bin/blhc b/bin/blhc
index 1cb49a6..6f91074 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -275,8 +275,7 @@ foreach my $line (@input) {
     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\s+(\\\s+)*([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+(.+?\s+)?--mode=(re)?link}) {
         $compiler = 0;