Browse Source

Merge pull request #3778 from martin-frbg/issue3775

Fix misdetection of gfortran on Cray systems
tags/v0.3.22^2
Martin Kroeker GitHub 3 years ago
parent
commit
a84a8a7096
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
  1. +4
    -4
      f_check
  2. +4
    -5
      f_check.pl

+ 4
- 4
f_check 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=''


+ 4
- 5
f_check.pl 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";

}



Loading…
Cancel
Save