summaryrefslogtreecommitdiff
path: root/make/unit-cc.pl
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2015-06-03 14:53:09 +0100
committerPeter Powell <petpow@saberuk.com>2015-06-03 14:59:08 +0100
commitcf94052d8fae19b12e43e25eb154ab89e2648f56 (patch)
treed4b61eb823f7787ff58a3f633ffd9143984142c4 /make/unit-cc.pl
parentd549fbb7d3912b6bef86099ac6b2e552ce3c3cee (diff)
Fix modules with 2+ files not having their LinkerFlags parsed.
Diffstat (limited to 'make/unit-cc.pl')
-rwxr-xr-xmake/unit-cc.pl6
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;
}