Fix timer crashes: relying on an iterator after adding to/resorting the vector probab...

[user/henk/code/inspircd.git] / make / run-cc.pl

diff --git a/make/run-cc.pl b/make/run-cc.pl
index 58e7f6050849b208ab35cf969f58868738fe41a6..71a921c61e7bab3c441593c6a4ae7abe9b994b12 100755 (executable)
--- a/make/run-cc.pl
+++ b/make/run-cc.pl
@@ -18,6 +18,11 @@ use POSIX ();
 
 my $cc = shift(@ARGV);
 
+my $showncmdline = 0;
+
+# GCC's "location of error stuff", which accumulates the "In file included from" include stack
+my $location = "";
+
 my @msgfilters = (
        [ qr/^(.*) warning: cannot pass objects of non-POD type `(.*)' through `\.\.\.'; call will abort at runtime/ => sub {
                my ($msg, $where, $type) = @_;
@@ -28,14 +33,42 @@ my @msgfilters = (
                die $errstr;
        } ],
 
+       # Start of an include stack.
+       [ qr/^In file included from .*[,:]$/ => sub {
+               my ($msg) = @_;
+               $location = "$msg\n";
+       } ],
+
+       # Continuation of an include stack.
+       [ qr/^                 from .*[,:]$/ => sub {
+               my ($msg) = @_;
+               $location .= "$msg\n";
+       } ],
+
+       # A function, method, constructor, or destructor is the site of a problem
+       [ qr/In ((con|de)structor|(member )?function)/ => sub {
+               my ($msg) = @_;
+               # If a complete location string is waiting then probably we dropped an error, so drop the location for a new one.
+               if ($location =~ m/In ((con|de)structor|(member )?function)/) {
+                       $location = "$msg\n";
+               } else {
+                       $location .= "$msg\n";
+               }
+       } ],
+
        [ qr/^.* warning: / => sub {
                my ($msg) = @_;
+               print $location;
+               $location = "";
                print STDERR "\e[33;1m$msg\e[0m\n";
        } ],
 
        [ qr/^.* error: / => sub {
                my ($msg) = @_;
-               print STDERR "An error occured when executing:\e[37;1m $cc " . join(' ', @ARGV) . "\n";
+               print STDERR "An error occured when executing:\e[37;1m $cc " . join(' ', @ARGV) . "\n" unless $showncmdline;
+               $showncmdline = 1;
+               print $location;
+               $location = "";
                print STDERR "\e[31;1m$msg\e[0m\n";
        } ],
 );
@@ -45,11 +78,23 @@ my $pid;
 my ($r_stderr, $w_stderr);
 
 my $name = "";
+my $action = "";
 
 foreach my $n (@ARGV)
 {
        if ($n =~ /\.cpp$/)
        {
+               $action = "BUILD";
+               $name = $n;
+               last;
+       }
+       elsif ($n eq "-o")
+       {
+               $action = $name = $n;
+       }
+       elsif ($name eq "-o")
+       {
+               $action = "LINK";
                $name = $n;
        }
 }
@@ -66,7 +111,7 @@ die "Cannot fork to start gcc! $!\n" unless defined($pid);
 
 if ($pid) {
 
-       print "\t\e[1;32mBUILD:\e[0m\t\t$name\n" unless $name eq "";
+       print "\t\e[1;32m$action:\e[0m\t\t$name\n" unless $name eq "";
 
        my $fail = 0;
        # Parent - Close child-side pipes.