X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=210f0ac5a0511f8fcb829493c491b07d94015c9f;hb=fe9d0d4971ff25e278b744ad89e3724ee42f67b0;hp=d662283e4b9a2e2e0f768fee4e8bd158954f934b;hpb=95124b124684fece31ecba687478878aa609756b;p=blhc%2Fblhc.git diff --git a/bin/blhc b/bin/blhc index d662283..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,12 +275,13 @@ foreach my $line (@input) { my $linker = 0; # Linker commands. - 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!) - (\.so[0-9.]*[a-z]?|\.la)? # library (including version) - (\s|\\|\$) # end of file name + 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}) {