X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Funit-cc.pl;h=66e9b15dcc2356b4c035fc42042f1c5d039198eb;hb=bdefe32944c2fa2d27dd00ba6eec8863d72d2dbd;hp=fbe36c4d2926674d5f57917bab1490d3f330dfc8;hpb=03166a7d11b54cee1fa71ad1299e09689455efcc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index fbe36c4d2..66e9b15dc 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -1,4 +1,24 @@
 #!/usr/bin/env perl
+
+#
+# InspIRCd -- Internet Relay Chat Daemon
+#
+#   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+#
+# 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/>.
+#
+
+
 use strict;
 use warnings;
 BEGIN { push @INC, $ENV{SOURCEPATH}; }
@@ -10,6 +30,22 @@ my $type = shift;
 my $out = shift;
 my $verbose = ($type =~ s/-v$//);
 
+## BEGIN HACK: REMOVE IN 2.2!
+sub read_config_cache {
+	my %cfg = ();
+	open(CACHE, '../.config.cache') or return %cfg;
+	while (my $line = <CACHE>) {
+		next if $line =~ /^\s*($|\#)/;
+		my ($key, $value) = ($line =~ /^(\S+)="(.*)"$/);
+		$cfg{$key} = $value;
+	}
+	close(CACHE);
+	return %cfg;
+}
+
+our %config = read_config_cache();
+## END HACK
+
 if ($type eq 'gen-ld') {
 	do_static_find(@ARGV);
 } elsif ($type eq 'static-ld') {
@@ -32,7 +68,7 @@ exit 1;
 sub do_static_find {
 	my @flags;
 	for my $file (@ARGV) {
-		push @flags, getlinkerflags($file);
+		push @flags, get_property($file, 'LinkerFlags');
 	}
 	open F, '>', $out;
 	print F join ' ', @flags;
@@ -77,12 +113,10 @@ sub do_compile {
 	my $libs = '';
 	my $binary = $ENV{RUNCC};
 	if ($do_compile) {
-		$flags = $ENV{CXXFLAGS};
-		$flags =~ s/ -pedantic// if nopedantic($file);
-		$flags .= ' ' . getcompilerflags($file);
+		$flags = $ENV{CORECXXFLAGS} . ' ' . get_property($file, 'CompileFlags');
 
-		if ($file =~ m#(?:^|/)((?:m|cmd)_[^/. ]+)(?:\.cpp|/.*\.cpp)$#) {
-			$flags .= ' -DMODNAME='.$1.'.so';
+		if ($file =~ m#(?:^|/)((?:m|core)_[^/. ]+)(?:\.cpp|/.*\.cpp)$#) {
+			$flags .= ' -DMODNAME=\\"'.$1.'\\"';
 		}
 	} else {
 		$binary = $ENV{RUNLD};
@@ -90,7 +124,7 @@ sub do_compile {
 
 	if ($do_link) {
 		$flags = join ' ', $flags, $ENV{PICLDFLAGS};
-		$libs = join ' ', getlinkerflags($file);
+		$libs = get_property($file, 'LinkerFlags');
 	} else {
 		$flags .= ' -c';
 	}