From 1fa6ae0dfc6b1ddec3646e45baca2ebe5faef6f1 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Wed, 14 Mar 2012 02:03:12 +0100 Subject: [PATCH] Improve linker command detection. -llib can be used in non linker commands as well. --- bin/blhc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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; -- 2.45.2