floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent 8e851160d7 79d842047a
commit a84a8a7096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
f_check
View File

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

9
f_check.pl
View File

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