Typo

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

diff --git a/make/run-cc.pl b/make/run-cc.pl
index b12466e2c06fd3d0635678a9b1b26c542eff8be0..7ea2f39d009b85120a0f4849a4df3f10bfdcbe1c 100755 (executable)
--- a/make/run-cc.pl
+++ b/make/run-cc.pl
@@ -82,33 +82,38 @@ my ($r_stderr, $w_stderr);
 my $name = "";
 my $action = "";
 
-foreach my $n (@ARGV)
-{
-       if ($n =~ /\.cpp$/)
+if ($cc eq "ar") {
+       $name = $ARGV[1];
+       $action = "ARCHIVE";
+} else {
+       foreach my $n (@ARGV)
        {
-               if ($action eq "BUILD")
+               if ($n =~ /\.cpp$/)
+               {
+                       if ($action eq "BUILD")
+                       {
+                               $name .= " " . $n;
+                       }
+                       else
+                       {
+                               $action = "BUILD";
+                               $name = $n;
+                       }
+               }
+               elsif ($action eq "BUILD") # .cpp has priority.
+               {
+                       next;
+               }
+               elsif ($n eq "-o")
                {
-                       $name .= " " . $n;
+                       $action = $name = $n;
                }
-               else
+               elsif ($name eq "-o")
                {
-                       $action = "BUILD";
+                       $action = "LINK";
                        $name = $n;
                }
        }
-       elsif ($action eq "BUILD") # .cpp has priority.
-       {
-               next;
-       }
-       elsif ($n eq "-o")
-       {
-               $action = $name = $n;
-       }
-       elsif ($name eq "-o")
-       {
-               $action = "LINK";
-               $name = $n;
-       }
 }
 
 if (!defined($cc) || $cc eq "") {
@@ -119,11 +124,11 @@ pipe($r_stderr, $w_stderr) or die "pipe stderr: $!\n";
 
 $pid = fork;
 
-die "Cannot fork to start gcc! $!\n" unless defined($pid);
+die "Cannot fork to start $cc! $!\n" unless defined($pid);
 
 if ($pid) {
 
-       print "\t\e[1;32m$action:\e[0m\t\t$name\n" unless $name eq "";
+       printf "\t\e[1;32m%-20s\e[0m%s\n", $action . ":", $name unless $name eq "";
 
        my $fail = 0;
        # Parent - Close child-side pipes.
@@ -133,6 +138,16 @@ if ($pid) {
        # Now read each line of stderr
 LINE:  while (defined(my $line = <$r_stderr>)) {
                chomp $line;
+
+               # someone come up with a better way of doing this, it cant go in message filters as message filters
+               # cant do straight-out replace.
+               #
+               # The order of these replacements is IMPORTANT. DO NOT REORDER THEM.
+
+               $line =~ s/std\:\:basic_string\<char\, std\:\:char_traits\<char\>, std::allocator\<char\> \>(\s+|)/std::string/g;
+               $line =~ s/std\:\:basic_string\<char\, .*?irc_char_traits\<char\>, std::allocator\<char\> \>(\s+|)/irc::string/g;
+               $line =~ s/std\:\:deque\<(\S+)\, std::allocator\<\S+\> \>/std::deque<$1>/g;
+
                for my $filter (@msgfilters) {
                        my @caps;
                        if (@caps = ($line =~ $filter->[0])) {