From 5e78493d956093413142064184c273615e44da0b Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 30 Sep 2022 11:55:56 +0200 Subject: [PATCH 1/2] Move Cray case after GNU as Cray builds of gfortran have both names in the version string --- f_check | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/f_check b/f_check index bb13e1640..02e078b8a 100755 --- a/f_check +++ b/f_check @@ -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='' From 79d842047ad1abd4f0d2ea9e4794564916db8041 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 30 Sep 2022 11:58:15 +0200 Subject: [PATCH 2/2] Move Cray case after GNU as Cray builds of gfortran have both names in the version string --- f_check.pl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/f_check.pl b/f_check.pl index cfc7331c2..f093b9ad5 100644 --- a/f_check.pl +++ b/f_check.pl @@ -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"; }