diff options
| author | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2010-04-17 02:17:19 +0000 |
|---|---|---|
| committer | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2010-04-17 02:17:19 +0000 |
| commit | f101b88e054b06357f56172ac8bbd59daf199562 (patch) | |
| tree | 290bfc6827d8fd2c9eae13edae0d90a5caf8e109 /lib/make/known-architectures | |
| parent | 6d2f0a1f7c76fda5762309a8dba86acfcd5acd81 (diff) | |
The architecture file xt4-cray-linux misdetects the GNU Fortran
compiler gfortran as the Portland compiler when gfortran is called
through the ftn wrapper that Kraken provides.
The fix is to do what the linux architecture file does and to remove
the faulty test for Portland, and also fix the test for GNU Fortran to
not require '95' in the version string.
(Patch by Roland Haas)
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4605 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/known-architectures')
| -rw-r--r-- | lib/make/known-architectures/xt4-cray-linux | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/make/known-architectures/xt4-cray-linux b/lib/make/known-architectures/xt4-cray-linux index 4696a28c..530b6b3e 100644 --- a/lib/make/known-architectures/xt4-cray-linux +++ b/lib/make/known-architectures/xt4-cray-linux @@ -5,7 +5,7 @@ # @author John Shalf # @desc # known-architectures file for Cray XT4 running Compute Node Linux (CNL) -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/xt4-cray-linux,v 1.3 2009-12-29 21:50:28 schnetter Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/xt4-cray-linux,v 1.4 2010-04-17 02:17:19 schnetter Exp $ # @@*/ @@ -38,13 +38,11 @@ else LINUX_F90_COMP=portland elif test "`$F90 -V 2>&1 | grep pgf95`" ; then LINUX_F90_COMP=portland - elif test "`$F90 -V 2>&1 | grep ftn`" ; then - LINUX_F90_COMP=portland elif test "`$F90 -v 2>&1 | grep -i g77`" ; then 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 95'`" ; then + elif test "`$F90 -dumpversion 2>&1 | grep 'GNU Fortran'`" ; then LINUX_F90_COMP=gnu95 else echo 'Unknown Linux f90 compiler.' @@ -58,11 +56,9 @@ else LINUX_F90_COMP=portland elif test "`$F90 -V 2>&1 | grep pgf95`" ; then LINUX_F90_COMP=portland - elif test "`$F90 -V 2>&1 | grep ftn`" ; then - 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 95'`" ; then + elif test "`$F77 -dumpversion 2>&1 | grep 'GNU Fortran'`" ; then LINUX_F90_COMP=gnu95 elif test "`$F90 -v 2>&1 | grep PathScale`" ; then LINUX_F90_COMP=PathScale |