Merge pull request #3778 from martin-frbg/issue3775

Fix misdetection of gfortran on Cray systems
This commit is contained in:
Martin Kroeker
2022-10-01 15:12:40 +02:00
committed by GitHub
2 changed files with 8 additions and 9 deletions

View File

@@ -82,10 +82,6 @@ else
vendor=FUJITSU
openmp='-Kopenmp'
;;
*Cray*)
vendor=CRAY
openmp='-fopenmp'
;;
*GNU*|*GCC*)
v="${data#*GCC: *\) }"
@@ -117,6 +113,10 @@ else
esac
fi
;;
*Cray*)
vendor=CRAY
openmp='-fopenmp'
;;
*g95*)
vendor=G95
openmp=''

View File

@@ -76,11 +76,6 @@ if ($compiler eq "") {
$vendor = FUJITSU;
$openmp = "-Kopenmp";
} elsif ($data =~ /Cray/) {
$vendor = CRAY;
$openmp = "-fopenmp";
} elsif ($data =~ /GNU/ || $data =~ /GCC/ ) {
$data =~ s/\(+.*?\)+//g;
@@ -106,6 +101,10 @@ if ($compiler eq "") {
$openmp = "";
}
}
} elsif ($data =~ /Cray/) {
$vendor = CRAY;
$openmp = "-fopenmp";
}