1 files changed, 36 insertions, 64 deletions

diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index a494fb74b..311c4c260 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -19,38 +19,25 @@
 #
 
 
+BEGIN {
+	push @INC, $ENV{SOURCEPATH};
+	require 5.10.0;
+}
+
 use strict;
-use warnings;
-BEGIN { push @INC, $ENV{SOURCEPATH}; }
-use make::configure;
+use warnings FATAL => qw(all);
+
+use File::Spec::Functions qw(abs2rel);
+
+use make::console;
+use make::directive;
 
 chdir $ENV{BUILDPATH};
 
 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') {
-	do_static_link(@ARGV);
-} elsif ($type eq 'core-ld') {
+if ($type eq 'core-ld') {
 	do_core_link(@ARGV);
 } elsif ($type eq 'link-dir') {
 	do_link_dir(@ARGV);
@@ -65,44 +52,34 @@ if ($type eq 'gen-ld') {
 }
 exit 1;
 
-sub do_static_find {
-	my @flags;
-	for my $file (@ARGV) {
-		push @flags, getlinkerflags($file);
+sub message($$$) {
+	my ($type, $file, $command) = @_;
+	if ($ENV{INSPIRCD_VERBOSE}) {
+		print "$command\n";
+	} else {
+		print_format "\t<|GREEN $type:|>\t\t$file\n";
 	}
-	open F, '>', $out;
-	print F join ' ', @flags;
-	close F;
-	exit 0;
 }
 
-sub do_static_link {
-	my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS}";
-	for (@ARGV) {
-		if (/\.cmd$/) {
-			open F, '<', $_;
-			my $libs = <F>;
-			chomp $libs;
-			$execstr .= ' '.$libs;
-			close F;
-		} else {
-			$execstr .= ' '.$_;
-		}
-	}
-	$execstr .= ' '.$ENV{LDLIBS};
-	print "$execstr\n" if $verbose;
-	exec $execstr;
+sub rpath($) {
+	my $message = shift;
+	$message =~ s/-L(\S+)/-Wl,-rpath,$1 -L$1/g unless defined $ENV{INSPIRCD_DISABLE_RPATH};
+	return $message;
 }
 
 sub do_core_link {
-	my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS} @_ $ENV{LDLIBS}";
-	print "$execstr\n" if $verbose;
+	my $execstr = "$ENV{CXX} -o $out $ENV{CORELDFLAGS} @_ $ENV{LDLIBS}";
+	message 'LINK', $out, $execstr;
 	exec $execstr;
 }
 
 sub do_link_dir {
-	my $execstr = "$ENV{RUNLD} -o $out $ENV{PICLDFLAGS} @_";
-	print "$execstr\n" if $verbose;
+	my ($dir, $link_flags) = (shift, '');
+	for my $file (<$dir/*.cpp>) {
+		$link_flags .= rpath(get_directive($file, 'LinkerFlags', '')) . ' ';
+	}
+	my $execstr = "$ENV{CXX} -o $out $ENV{PICLDFLAGS} $link_flags @_";
+	message 'LINK', $out, $execstr;
 	exec $execstr;
 }
 
@@ -111,27 +88,22 @@ sub do_compile {
 
 	my $flags = '';
 	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_directive($file, 'CompilerFlags', '');
 
-		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};
 	}
 
 	if ($do_link) {
 		$flags = join ' ', $flags, $ENV{PICLDFLAGS};
-		$libs = join ' ', getlinkerflags($file);
+		$libs = rpath(get_directive($file, 'LinkerFlags', ''));
 	} else {
 		$flags .= ' -c';
 	}
 
-	my $execstr = "$binary -o $out $flags $file $libs";
-	print "$execstr\n" if $verbose;
+	my $execstr = "$ENV{CXX} -o $out $flags $file $libs";
+	message 'BUILD', abs2rel($file, "$ENV{SOURCEPATH}/src"), $execstr;
 	exec $execstr;
 }