Merge pull request #1054 from SaberUK/master+fix-linking-modules

Fix modules with 2+ files not having their LinkerFlags parsed.

1 files changed, 5 insertions, 1 deletions

diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index 0a20738db..aba14a0bc 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -104,7 +104,11 @@ sub do_core_link {
 }
 
 sub do_link_dir {
-	my $execstr = "$ENV{CXX} -o $out $ENV{PICLDFLAGS} @_";
+	my ($dir, $link_flags) = (shift, '');
+	for my $file (<$dir/*.cpp>) {
+		$link_flags .= get_property($file, 'LinkerFlags') . ' ';
+	}
+	my $execstr = "$ENV{CXX} -o $out $ENV{PICLDFLAGS} $link_flags @_";
 	message 'LINK', $out, $execstr;
 	exec $execstr;
 }