X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=a884e11407188fcf0e679416e695150cbf4f4b08;hp=1d1fc27d6d2a5cdbe613de7c37cdf04105243f1f;hb=ca67c9cf80b5b8e3ca1c0e44d1d10e4d67020d5e;hpb=5b550dc892a6568f9f4ddc71106a7b879ee380c3 diff --git a/bin/blhc b/bin/blhc index 1d1fc27..a884e11 100755 --- a/bin/blhc +++ b/bin/blhc @@ -166,7 +166,7 @@ sub is_non_verbose_build { my ($line, $next_line, $skip_ref) = @_; if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/ - or $line =~ /^\s*(?:CC|CCLD)\s+(.+?)$/ + or $line =~ /^\s*\[?(?:CC|CCLD|LD)\]?\s+(.+?)$/ or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/ or $line =~ /^\s*(?:B|b)uilding (?:program|shared library)\s+(.+?)$/ or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) { @@ -282,6 +282,13 @@ while (my $line = <>) { # Ignore compiler warnings for now. next if $line =~ /$warning_regex/; + # Remove all ANSI color sequences which are sometimes used in non-verbose + # builds. + $line = Term::ANSIColor::colorstrip($line); + # Also strip '\0xf' (delete previous character), used by Elink's build + # system. + $line =~ s/\x0f//g; + # Check if this line indicates a non verbose build. my $non_verbose = is_non_verbose_build($line);