From aa0da48a68484b4656e97251de39086d0a80137d Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sat, 31 Mar 2012 15:00:34 +0200 Subject: [PATCH] Store exit codes in %exit_code. --- bin/blhc | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/bin/blhc b/bin/blhc index 9800eaf..7f1fd84 100755 --- a/bin/blhc +++ b/bin/blhc @@ -203,6 +203,14 @@ my %flag_renames = ( '-Wl,(-z,)?now' => '-Wl,-z,now', ); +my %exit_code = ( + no_compiler_commands => 1 << 0, + # used by POD::Usage => 1 << 1, + non_verbose_build => 1 << 2, + flags_missing => 1 << 3, + hardening_wrapper => 1 << 4, +); + # Statistics of missing flags and non-verbose build commands. Used for # $option_buildd. my %statistics = ( @@ -494,7 +502,7 @@ FILE: foreach my $file (@ARGV) { } else { print "I-hardening-wrapper-used\n"; } - $exit |= 1 << 4; + $exit |= $exit_code{hardening_wrapper}; next FILE; } @@ -612,7 +620,7 @@ FILE: foreach my $file (@ARGV) { } else { print "W-no-compiler-commands\n"; } - $exit |= 1; + $exit |= $exit_code{no_compiler_commands}; next FILE; } @@ -682,7 +690,7 @@ FILE: foreach my $file (@ARGV) { } else { $statistics{commands_nonverbose}++; } - $exit |= 1 << 2; + $exit |= $exit_code{non_verbose_build}; next; } # Even if it's a verbose build, we might have to skip this line. @@ -771,7 +779,7 @@ FILE: foreach my $file (@ARGV) { } else { $statistics{compile_missing}++; } - $exit |= 1 << 3; + $exit |= $exit_code{flags_missing}; } elsif ($compile_cpp and not all_flags_used($line, \@missing, @cflags) # Libraries linked with -fPIC don't have to (and can't) be # linked with -fPIE as well. It's no error if only PIE flags @@ -784,7 +792,7 @@ FILE: foreach my $file (@ARGV) { } else { $statistics{compile_cpp_missing}++; } - $exit |= 1 << 3; + $exit |= $exit_code{flags_missing}; } if ($preprocess and not all_flags_used($line, \@missing, @cppflags) # Assume dpkg-buildflags returns the correct flags. @@ -794,7 +802,7 @@ FILE: foreach my $file (@ARGV) { } else { $statistics{preprocess_missing}++; } - $exit |= 1 << 3; + $exit |= $exit_code{flags_missing}; } if ($link and not all_flags_used($line, \@missing, @ldflags) # Same here, -fPIC conflicts with -fPIE. @@ -806,7 +814,7 @@ FILE: foreach my $file (@ARGV) { } else { $statistics{link_missing}++; } - $exit |= 1 << 3; + $exit |= $exit_code{flags_missing}; } } } -- 2.45.2