X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=210f0ac5a0511f8fcb829493c491b07d94015c9f;hb=fe9d0d4971ff25e278b744ad89e3724ee42f67b0;hp=1cb49a6aa13990507138fc292bf995431571e6a8;hpb=5b6b8e2eddbb9e6590e59a84d160e5d23bc09a9a;p=blhc%2Fblhc.git

diff --git a/bin/blhc b/bin/blhc
index 1cb49a6..210f0ac 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -87,7 +87,7 @@ sub pic_pie_conflict {
     my ($line, $pie, $missing_flags_ref, @flags_pie) = @_;
 
     return 0 if not $pie;
-    return 0 if not any_flags_used($line, ('-fPIC'));
+    return 0 if not any_flags_used($line, ('-fPIC', '-fpic'));
 
     my %flags = map { $_ => 1 } @flags_pie;
 
@@ -275,8 +275,14 @@ 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                      # -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;