summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2009-03-11 15:21:52 +0000
committertradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2009-03-11 15:21:52 +0000
commit5594d1f26d1bc5d3e36b9ff9f9ad40310c50c2e0 (patch)
tree13b17597d14574971ae3384c4962fe16065a342d
parentfe4614f8d956b56b18274b81855ab98712520818 (diff)
fix from Maciej Brodowicz to properly detect the major/minor version of gfortran
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4556 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r--lib/make/known-architectures/linux8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux
index 7987a82c..a49dfe53 100644
--- a/lib/make/known-architectures/linux
+++ b/lib/make/known-architectures/linux
@@ -152,13 +152,13 @@ else
F77_VERSION="`$F77 -dumpversion 2>&1 | head -n1`"
F90_VERSION="`$F90 -dumpversion 2>&1 | head -n1`"
# only gfortran versions 4.1 and higher support OpenMP
- major_version=`echo $F77_VERSION | cut -f5 -d' ' | cut -f1 -d'.'`
- minor_version=`echo $F77_VERSION | cut -f5 -d' ' | cut -f2 -d'.'`
+ major_version=`echo $F77_VERSION | cut -d')' -f2 | tr -d ' ' | cut -d'.' -f1`
+ minor_version=`echo $F77_VERSION | cut -d')' -f2 | cut -d'.' -f2`
if test ! \( $major_version -lt 4 -o \( $major_version = 4 -a $minor_version -lt 1 \) \) ; then
: ${F77_OPENMP_FLAGS='-fopenmp'}
fi
- major_version=`echo $F90_VERSION | cut -f5 -d' ' | cut -f1 -d'.'`
- minor_version=`echo $F90_VERSION | cut -f5 -d' ' | cut -f2 -d'.'`
+ major_version=`echo $F90_VERSION | cut -d')' -f2 | tr -d ' ' | cut -d'.' -f1`
+ minor_version=`echo $F90_VERSION | cut -d')' -f2 | cut -d'.' -f2`
if test ! \( $major_version -lt 4 -o \( $major_version = 4 -a $minor_version -lt 1 \) \) ; then
: ${F90_OPENMP_FLAGS='-fopenmp'}
fi