Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

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

diff --git a/make/run-cc.pl b/make/run-cc.pl
index 1ae219f69922a777792b5fce98373137416f3187..58b5850ca1142f1b8feda00c9c59df13dd32005a 100755 (executable)
--- a/make/run-cc.pl
+++ b/make/run-cc.pl
@@ -1,4 +1,24 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
+
+#
+# InspIRCd -- Internet Relay Chat Daemon
+#
+#   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+#   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+#
+# This file is part of InspIRCd.  InspIRCd is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 
 ### THIS IS DESIGNED TO BE RUN BY MAKE! DO NOT RUN FROM THE SHELL (because it MIGHT sigterm the shell)! ###
 
@@ -26,9 +46,8 @@ my $location = "";
 my @msgfilters = (
        [ qr/^(.*) warning: cannot pass objects of non-POD type `(.*)' through `\.\.\.'; call will abort at runtime/ => sub {
                my ($msg, $where, $type) = @_;
-               print $location;
+               my $errstr = $location . "$where error: cannot pass objects of non-POD type `$type' through `...'\n";
                $location = "";
-               my $errstr = "$where error: cannot pass objects of non-POD type `$type' through `...'\n";
                if ($type =~ m/::(basic_)?string/) {
                        $errstr .= "$where (Did you forget to call c_str()?)\n";
                }
@@ -64,6 +83,7 @@ my @msgfilters = (
        [ qr/^.* warning: / => sub {
                my ($msg) = @_;
                my $str = $location . "\e[33;1m$msg\e[0m\n";
+               $showncmdline = 1;
                $location = "";
                return $str;
        } ],
@@ -85,9 +105,15 @@ my @msgfilters = (
                $msg =~ s/std::basic_string\<char\, std\:\:char_traits\<char\>, std::allocator\<char\> \>(\s+|)/std::string/g;
                $msg =~ s/std::basic_string\<char\, .*?irc_char_traits\<char\>, std::allocator\<char\> \>(\s+|)/irc::string/g;
                for my $stl (qw(deque vector list)) {
-                       $msg =~ s/std::$stl\<(\S+), std::allocator\<(\1)\> \>/std::$stl\<$1\>/g;
+                       $msg =~ s/std::$stl\<(\S+), std::allocator\<\1\> \>/std::$stl\<$1\>/g;
+                       $msg =~ s/std::$stl\<(std::pair\<\S+, \S+\>), std::allocator\<\1 \> \>/std::$stl<$1 >/g;
                }
-               $msg =~ s/std::map\<(\S+), (\S+), std::less\<\1\>, std::allocator\<std::pair\<const \1, \2\> \> \>/std::map\<$1, $2\>/g;
+               $msg =~ s/std::map\<(\S+), (\S+), std::less\<\1\>, std::allocator\<std::pair\<const \1, \2\> \> \>/std::map<$1, $2>/g;
+               # Warning: These filters are GNU C++ specific!
+               $msg =~ s/__gnu_cxx::__normal_iterator\<(\S+)\*, std::vector\<\1\> \>/std::vector<$1>::iterator/g;
+               $msg =~ s/__gnu_cxx::__normal_iterator\<(std::pair\<\S+, \S+\>)\*, std::vector\<\1 \> \>/std::vector<$1 >::iterator/g;
+               $msg =~ s/__gnu_cxx::__normal_iterator\<char\*, std::string\>/std::string::iterator/g;
+               $msg =~ s/__gnu_cxx::__normal_iterator\<char\*, irc::string\>/irc::string::iterator/g;
                return $msg;
        } ],
 );
@@ -107,14 +133,18 @@ if ($cc eq "ar") {
        {
                if ($n =~ /\.cpp$/)
                {
+                       my $f = $n;
+                       if (defined $ENV{SOURCEPATH}) {
+                               $f =~ s#^$ENV{SOURCEPATH}/src/##;
+                       }
                        if ($action eq "BUILD")
                        {
-                               $name .= " " . $n;
+                               $name .= " " . $f;
                        }
                        else
                        {
                                $action = "BUILD";
-                               $name = $n;
+                               $name = $f;
                        }
                }
                elsif ($action eq "BUILD") # .cpp has priority.
@@ -156,12 +186,6 @@ if ($pid) {
 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.
-
-
                for my $filter (@msgfilters) {
                        my @caps;
                        if (@caps = ($line =~ $filter->[0])) {