diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-08-19 18:01:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 18:01:43 +0200 |
| commit | 2df0de3c9212f7ea74fcb9a0ccf20990e47e9f2e (patch) | |
| tree | 090b5c158e8d1669ed4d81bce6d3834ae9cf8bae /make | |
| parent | da04e0622c37d3d1ec6c3313fb5a82cbf9901329 (diff) | |
| parent | a6daa312e26532d68ffa70f6cf350baa5d43ca83 (diff) | |
Merge pull request #1200 from SaberUK/master+travis
Fix Travis builds on master.
Diffstat (limited to 'make')
| -rwxr-xr-x | make/unit-cc.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make/unit-cc.pl b/make/unit-cc.pl index a06d7b10f..f04423ce3 100755 --- a/make/unit-cc.pl +++ b/make/unit-cc.pl @@ -80,18 +80,19 @@ sub do_static_find { sub do_static_link { 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}; + $execstr .= ' '.$ENV{LDLIBS}.' '.$link_flags; message 'LINK', $out, $execstr; exec $execstr; } |