ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change argument order of LDLIBS to work properly with -Wl,--as-needed

Browse Source
This commit is contained in:
Daniel De Graaf 2010-07-02 11:27:17 -04:00
parent 4ced25a01f
commit 03166a7d11
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
make/unit-cc.pl
View File

@ -41,7 +41,7 @@ sub do_static_find {
}
sub do_static_link {
my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS} $ENV{LDLIBS}";
my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS}";
for (@ARGV) {
if (/\.cmd$/) {
open F, '<', $_;
@ -53,12 +53,13 @@ sub do_static_link {
$execstr .= ' '.$_;
}
}
$execstr .= ' '.$ENV{LDLIBS};
print "$execstr\n" if $verbose;
exec $execstr;
}
sub do_core_link {
my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS} $ENV{LDLIBS} @_";
my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS} @_ $ENV{LDLIBS}";
print "$execstr\n" if $verbose;
exec $execstr;
}
@ -73,6 +74,7 @@ sub do_compile {
my ($do_compile, $do_link, $file) = @_;
my $flags = '';
my $libs = '';
my $binary = $ENV{RUNCC};
if ($do_compile) {
$flags = $ENV{CXXFLAGS};
@ -87,12 +89,13 @@ sub do_compile {
}
if ($do_link) {
$flags = join ' ', $flags, $ENV{PICLDFLAGS}, getlinkerflags($file);
$flags = join ' ', $flags, $ENV{PICLDFLAGS};
$libs = join ' ', getlinkerflags($file);
} else {
$flags .= ' -c';
}
my $execstr = "$binary -o $out $flags $file";
my $execstr = "$binary -o $out $flags $file $libs";
print "$execstr\n" if $verbose;
exec $execstr;
}