diff options
| author | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2009-12-29 21:50:28 +0000 |
|---|---|---|
| committer | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2009-12-29 21:50:28 +0000 |
| commit | ac9329b32319d41c79cc30cf6c7faea3f5748d1b (patch) | |
| tree | 62c0bed98a4b6325d5fc2f26c95254df340b2b44 /lib | |
| parent | 3cc7753fb38cae05c5ff52978537dde724f4813a (diff) | |
Do not overwrite the user's MPI settings
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4592 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/make/known-architectures/xt4-cray-linux | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/make/known-architectures/xt4-cray-linux b/lib/make/known-architectures/xt4-cray-linux index 700cc260..4696a28c 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.2 2009-12-05 00:16:43 schnetter Exp $ +# @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 $ # @@*/ @@ -14,9 +14,9 @@ echo " Forcing MPI to NATIVE." MPI='NATIVE' if test -n "$MPI" ; then - NATIVE_MPI_LIBS=' ' - NATIVE_MPI_LIB_DIRS=' ' - NATIVE_MPI_INC_DIRS=' ' + : ${NATIVE_MPI_LIBS=' '} + : ${NATIVE_MPI_LIB_DIRS=' '} + : ${NATIVE_MPI_INC_DIRS=' '} fi if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then @@ -175,10 +175,11 @@ else case `basename $CC` in # GNU pgcc | cc) + : ${CC='cc'} : ${CFLAGS='-DCRAY_XT'} : ${C_OPTIMISE_FLAGS='-fastsse -O3 -Mvect=assoc'} : ${C_WARN_FLAGS='-Minfo -Mneginfo'} - : ${CC='cc'} + : ${C_DEPEND='$(CC) $(CPPFLAGS) $(CFLAGS) -E -M'} CC_VERSION="`$CC -V 2>&1 | grep -i pgcc | head -n1`" ;; pathcc) @@ -200,6 +201,7 @@ else : ${CXXFLAGS='--no_using_std -DCRAY_XT'} : ${CXX_OPTIMISE_FLAGS='-fastsse -O3 -Mvect=assoc'} : ${CXX_WARN_FLAGS='-Minfo -Mneginfo'} + : ${CXX_DEPEND='$(CXX) $(CPPFLAGS) $(CXXFLAGS) -E -M'} if test `basename $LD` = 'pgCC'; then : ${LDFLAGS='-Wl,--allow-multiple-definition'} fi |