X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Funit-cc.pl;h=66e9b15dcc2356b4c035fc42042f1c5d039198eb;hb=365e2b45f871d80debb135b0f26766538d10809d;hp=a494fb74b06d712a21278c5f22c91cee0e6ef139;hpb=8258232b7beaf48330eb522a78fe320bb636d59b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index a494fb74b..66e9b15dc 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -68,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;
@@ -113,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};
@@ -126,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';
 	}