summaryrefslogtreecommitdiff
path: root/lib/make/known-architectures/linux
diff options
context:
space:
mode:
authorjshalf <jshalf@17b73243-c579-4c4c-a9d2-2d5706c11dac>2007-10-26 04:08:38 +0000
committerjshalf <jshalf@17b73243-c579-4c4c-a9d2-2d5706c11dac>2007-10-26 04:08:38 +0000
commitd86bd6a665f59d393496be7a928e7641e8b9605a (patch)
treeaaf6792626e40ca05038ba9577e61da2b393a7b4 /lib/make/known-architectures/linux
parent9b7dad6ad0d13f50a69f54225456171b5017bde5 (diff)
Fixed error in linux config file.
Linux file detects XT4 Linux systems and vectors to xt4-cray-linux config. git-svn-id: http://svn.cactuscode.org/flesh/trunk@4435 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/known-architectures/linux')
-rw-r--r--lib/make/known-architectures/linux12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux
index cc8c6d21..76f10633 100644
--- a/lib/make/known-architectures/linux
+++ b/lib/make/known-architectures/linux
@@ -9,6 +9,13 @@
# @version $Header$
# @@*/
+if test -e "/usr/bin/aprun" ; then
+ echo "This is probably a Cray XT4 series system."
+ echo "Using known-architectures xt4-cray-linux"
+ . $srcdir/known-architectures/xt4-cray-linux
+else
+
+
if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then
if test -z "$FPP" -a -z "$FPPFLAGS"; then
@@ -201,7 +208,7 @@ else
: ${F77_OPTIMISE_FLAGS='-fast -Mvect=assoc'}
: ${F77_WARN_FLAGS='-Minfo -Mneginfo'}
: ${F90_OPTIMISE_FLAGS='-fast -Mvect=assoc'}
- : ${F90_OPTIMISE_FLAGS='-Minfo -Mneginfo'}
+ : ${F90_WARN_FLAGS='-Minfo -Mneginfo'}
: ${F77_DEBUG_FLAGS='-g'}
: ${F90_DEBUG_FLAGS='-g'}
F90_VERSION="`$F90 -V 2>&1 | grep -i pgf90 | head -n1`"
@@ -536,3 +543,6 @@ else
# This is caught by lib/make/extras/MPI/NATIVE then.
fi
+
+fi
+