X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make%2Funit-cc.pl;h=1cf6cf86601f2cd0d1b34001d4f7f07148c7d94a;hb=2772c2fa2d51de376d84dd3674c7c0214f570469;hp=77f97a3f2183d0b3c2f917eeb28652b25478da20;hpb=050c2cf253e27847f50eec29c5502904b112437b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index 77f97a3f2..1cf6cf866 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -19,16 +19,23 @@
 #
 
 
+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$//);
 
 if ($type eq 'gen-ld') {
 	do_static_find(@ARGV);
@@ -49,10 +56,25 @@ if ($type eq 'gen-ld') {
 }
 exit 1;
 
+sub message($$$) {
+	my ($type, $file, $command) = @_;
+	if ($ENV{INSPIRCD_VERBOSE}) {
+		print "$command\n";
+	} else {
+		print_format "\t<|GREEN $type:|>\t\t$file\n";
+	}
+}
+
+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_static_find {
 	my @flags;
 	for my $file (@ARGV) {
-		push @flags, get_property($file, 'LinkerFlags');
+		push @flags, rpath(get_directive($file, 'LinkerFlags', ''));
 	}
 	open F, '>', $out;
 	print F join ' ', @flags;
@@ -61,32 +83,37 @@ sub do_static_find {
 }
 
 sub do_static_link {
-	my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS}";
+	my $execstr = "$ENV{CXX} -o $out $ENV{CORELDFLAGS}";
+	my $link_flags = '';
 	for (@ARGV) {
 		if (/\.cmd$/) {
 			open F, '<', $_;
 			my $libs = <F>;
 			chomp $libs;
-			$execstr .= ' '.$libs;
+			$link_flags .= ' '.$libs;
 			close F;
 		} else {
 			$execstr .= ' '.$_;
 		}
 	}
-	$execstr .= ' '.$ENV{LDLIBS};
-	print "$execstr\n" if $verbose;
+	$execstr .= ' '.$ENV{LDLIBS}.' '.$link_flags;
+	message 'LINK', $out, $execstr;
 	exec $execstr;
 }
 
 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;
 }
 
@@ -95,25 +122,22 @@ sub do_compile {
 
 	my $flags = '';
 	my $libs = '';
-	my $binary = $ENV{RUNCC};
 	if ($do_compile) {
-		$flags = $ENV{CORECXXFLAGS} . ' ' . get_property($file, 'CompileFlags');
+		$flags = $ENV{CORECXXFLAGS} . ' ' . get_directive($file, 'CompilerFlags', '');
 
 		if ($file =~ m#(?:^|/)((?:m|core)_[^/. ]+)(?:\.cpp|/.*\.cpp)$#) {
 			$flags .= ' -DMODNAME=\\"'.$1.'\\"';
 		}
-	} else {
-		$binary = $ENV{RUNLD};
 	}
 
 	if ($do_link) {
 		$flags = join ' ', $flags, $ENV{PICLDFLAGS};
-		$libs = get_property($file, 'LinkerFlags');
+		$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;
 }