]> ruderich.org/simon Gitweb - blhc/blhc.git/commitdiff
Improve linker command detection.
authorSimon Ruderich <simon@ruderich.org>
Wed, 14 Mar 2012 01:03:12 +0000 (02:03 +0100)
committerSimon Ruderich <simon@ruderich.org>
Wed, 14 Mar 2012 01:03:12 +0000 (02:03 +0100)
-llib can be used in non linker commands as well.

bin/blhc

index 1cb49a6aa13990507138fc292bf995431571e6a8..6f9107474c16daed7040ceca6f523e94e90e8d02 100755 (executable)
--- 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;