Merge pull request #3010 from ggouaillardet/topic/fj_compilers
add Fujitsu compilers
This commit is contained in:
commit
52ed2741c5
11
f_check
11
f_check
|
@ -69,7 +69,12 @@ if ($compiler eq "") {
|
||||||
$bu = "_";
|
$bu = "_";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($data =~ /GNU/ || $data =~ /GCC/ ) {
|
if ($data =~ /Fujitsu/) {
|
||||||
|
|
||||||
|
$vendor = FUJITSU;
|
||||||
|
$openmp = "-Kopenmp";
|
||||||
|
|
||||||
|
} elsif ($data =~ /GNU/ || $data =~ /GCC/ ) {
|
||||||
|
|
||||||
$data =~ /(\d+)\.(\d+).(\d+)/;
|
$data =~ /(\d+)\.(\d+).(\d+)/;
|
||||||
$major = $1;
|
$major = $1;
|
||||||
|
@ -337,8 +342,8 @@ if ($link ne "") {
|
||||||
&& ($flags !~ /kernel32/)
|
&& ($flags !~ /kernel32/)
|
||||||
&& ($flags !~ /advapi32/)
|
&& ($flags !~ /advapi32/)
|
||||||
&& ($flags !~ /shell32/)
|
&& ($flags !~ /shell32/)
|
||||||
&& ($flags !~ /omp/ || ($vendor !~ /PGI/ && $flags =~ /omp/))
|
&& ($flags !~ /omp/ || ($vendor !~ /PGI/ && $vendor !~ /FUJITSU/ && $flags =~ /omp/))
|
||||||
&& ($flags !~ /[0-9]+/)
|
&& ($flags !~ /[0-9]+/ || ($vendor == FUJITSU && $flags =~ /^-lfj90/))
|
||||||
&& ($flags !~ /^\-l$/)
|
&& ($flags !~ /^\-l$/)
|
||||||
) {
|
) {
|
||||||
$linker_l .= $flags . " ";
|
$linker_l .= $flags . " ";
|
||||||
|
|
Loading…
Reference in New Issue