X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=38d0834cd4c1ddc37b70602cf0d186f64fc769ae;hp=b5177bdda7b88e6a452c57c93f091318c5d4301d;hb=e8c9cdc7a80e630245d179fd702de3c8beb12abb;hpb=4a632b4ff1fd63e85196fe3fcbea273d75b4b4ed diff --git a/bin/blhc b/bin/blhc index b5177bd..38d0834 100755 --- a/bin/blhc +++ b/bin/blhc @@ -729,9 +729,11 @@ foreach my $file (@ARGV) { } } - # Debian's build daemons use Build-Depends: for the build - # dependencies, but pbuilder just uses Depends:; support both. - if (index($line, 'Build-Depends: ') == 0 + # Debian's build daemons use "Filtered Build-Depends:" (or just + # "Build-Depends:" in older versions) for the build dependencies, but + # pbuilder uses "Depends:"; support both. + if (index($line, 'Filtered Build-Depends: ') == 0 + or index($line, 'Build-Depends: ') == 0 or index($line, 'Depends: ') == 0) { # If hardening wrapper is used (wraps calls to gcc and adds # hardening flags automatically) we can't perform any checks, @@ -977,8 +979,8 @@ foreach my $file (@ARGV) { # Stores normal CFLAGS when @cflags_ada are temporarily used. my @cflags_backup; - # Ada CFLAGS. - my @cflags_ada = @cflags; + # Ada CFLAGS, only set if ada is used. + my @cflags_ada; # Ada doesn't support format hardening flags, see #680117 for more # information. Filter them out if ada is used. if ($ada and $harden_format) {