diff options
| author | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2010-09-08 19:17:28 +0000 |
|---|---|---|
| committer | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2010-09-08 19:17:28 +0000 |
| commit | bb3b5682d42fac3b5cf3d82bf5e061f256df736e (patch) | |
| tree | dbb901f33103564fa61829ebcaf9431df261aafd | |
| parent | ecb7f7e6e12af71c2620d40dcc0aa0e6b3dfa8e9 (diff) | |
use --version instead of --dumpversion for gfortran because of changes in the output of the --version option, and to easily support old and new versions of gfortran
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4632 17b73243-c579-4c4c-a9d2-2d5706c11dac
| -rw-r--r-- | lib/make/known-architectures/linux | 8 | ||||
| -rw-r--r-- | lib/make/known-architectures/xt4-cray-linux | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux index a49dfe53..96dacbc6 100644 --- a/lib/make/known-architectures/linux +++ b/lib/make/known-architectures/linux @@ -53,7 +53,7 @@ else LINUX_F90_COMP=Compaq elif test "`$F90 -v 2>&1 | grep PathScale`" ; then LINUX_F90_COMP=PathScale - elif test "`$F90 -dumpversion 2>&1 | grep 'GNU Fortran'`" ; then + elif test "`$F90 --version 2>&1 | grep 'GNU Fortran'`" ; then LINUX_F90_COMP=gnu95 elif test "`$F90 -? 2>&1 | grep -i absoft`" ; then LINUX_F90_COMP=absoft77 @@ -80,7 +80,7 @@ else elif test -n "$F77" && test "$F77" != 'none' ; then if test "`$F77 -v 2>&1 | grep -i 'gcc version'`" ; then LINUX_F90_COMP=gnu77 - elif test "`$F77 -dumpversion 2>&1 | grep 'GNU Fortran'`" ; then + elif test "`$F77 --version 2>&1 | grep 'GNU Fortran'`" ; then LINUX_F90_COMP=gnu95 elif test "`$F77 -? 2>&1 | grep -i absoft`" ; then LINUX_F90_COMP=absoft77 @@ -149,8 +149,8 @@ else : ${LIBS='gfortran'} : ${LIBDIRS="$gnu95_libdir"} fi - F77_VERSION="`$F77 -dumpversion 2>&1 | head -n1`" - F90_VERSION="`$F90 -dumpversion 2>&1 | head -n1`" + F77_VERSION="`$F77 --version 2>&1 | head -n1`" + F90_VERSION="`$F90 --version 2>&1 | head -n1`" # only gfortran versions 4.1 and higher support OpenMP major_version=`echo $F77_VERSION | cut -d')' -f2 | tr -d ' ' | cut -d'.' -f1` minor_version=`echo $F77_VERSION | cut -d')' -f2 | cut -d'.' -f2` diff --git a/lib/make/known-architectures/xt4-cray-linux b/lib/make/known-architectures/xt4-cray-linux index 530b6b3e..54a79bef 100644 --- a/lib/make/known-architectures/xt4-cray-linux +++ b/lib/make/known-architectures/xt4-cray-linux @@ -42,7 +42,7 @@ else LINUX_F90_COMP=gnu77 elif test "`$F90 -v 2>&1 | grep PathScale`" ; then LINUX_F90_COMP=PathScale - elif test "`$F90 -dumpversion 2>&1 | grep 'GNU Fortran'`" ; then + elif test "`$F90 --version 2>&1 | grep 'GNU Fortran'`" ; then LINUX_F90_COMP=gnu95 else echo 'Unknown Linux f90 compiler.' @@ -58,7 +58,7 @@ else LINUX_F90_COMP=portland elif test "`$F77 -v 2>&1 | grep -i 'gcc version'`" ; then LINUX_F90_COMP=gnu77 - elif test "`$F77 -dumpversion 2>&1 | grep 'GNU Fortran'`" ; then + elif test "`$F77 --version 2>&1 | grep 'GNU Fortran'`" ; then LINUX_F90_COMP=gnu95 elif test "`$F90 -v 2>&1 | grep PathScale`" ; then LINUX_F90_COMP=PathScale @@ -118,8 +118,8 @@ else : ${LIBS='gfortran'} : ${LIBDIRS="$gnu95_libdir"} fi - F77_VERSION="`$F77 -dumpversion 2>&1 | grep -i version | head -n1`" - F90_VERSION="`$F90 -dumpversion 2>&1 | grep -i version | head -n1`" + F77_VERSION="`$F77 --version 2>&1 | grep -i version | head -n1`" + F90_VERSION="`$F90 --version 2>&1 | grep -i version | head -n1`" ;; portland) : ${LIBS='pgf90 pgf90rtl pgftnrtl pgf90_rpm1 pghpf2 pgc m'} |