Merge pull request #1017 from martin-frbg/develop

Make c_check, f_check convert any --exclude-libs arguments to linker flags
This commit is contained in:
Zhang Xianyi 2016-12-09 16:55:13 +08:00 committed by GitHub
commit db3efb2e14
2 changed files with 11 additions and 0 deletions

View File

@ -234,6 +234,11 @@ $linker_a = "";
$linker_L .= "-Wl,". $flags . " " $linker_L .= "-Wl,". $flags . " "
} }
if ($flags =~ /^\--exclude-libs/) {
$linker_L .= "-Wl,". $flags . " ";
$flags="";
}
if ( if (
($flags =~ /^\-l/) ($flags =~ /^\-l/)
&& ($flags !~ /gfortranbegin/) && ($flags !~ /gfortranbegin/)

View File

@ -283,6 +283,12 @@ if ($link ne "") {
$linker_L .= "-Wl,". $flags . " "; $linker_L .= "-Wl,". $flags . " ";
} }
if ($flags =~ /^\--exclude-libs/) {
$linker_L .= "-Wl,". $flags . " ";
$flags="";
}
if ($flags =~ /^\-rpath\@/) { if ($flags =~ /^\-rpath\@/) {
$flags =~ s/\@/\,/g; $flags =~ s/\@/\,/g;
if ($vendor eq "PGI") { if ($vendor eq "PGI") {