MPI: default to using the more common mpicxx instead of mpiCC
authorPhil Miller <mille121@illinois.edu>
Thu, 10 Dec 2009 18:40:10 +0000 (12:40 -0600)
committerPhil Miller <mille121@illinois.edu>
Thu, 10 Dec 2009 18:40:10 +0000 (12:40 -0600)
src/arch/mpi-linux-ppc/conv-mach.sh
src/arch/mpi-linux-x86_64/conv-mach.sh
src/arch/mpi-linux/conv-mach.sh

index bb78a52467d42d445ab4ef32502c906ed0adc766..9c8d73398e26948e206bd62375bf8553f6bd68cd 100644 (file)
@@ -2,7 +2,7 @@ CMK_CPP_CHARM='/lib/cpp -P'
 CMK_CPP_C='mpicc -E'
 CMK_CC='mpicc '
 CMK_CXX='mpicxx '
-CMK_CXXPP='mpiCC -E '
+CMK_CXXPP='mpicxx -E '
 CMK_RANLIB='ranlib'
 CMK_LIBS='-lckqt -lmpich '
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
index 96281355b6c46b7b7d7d367180c6f6275cbc702b..cb58afa555a388e2cd696eae817b6ad33494312e 100644 (file)
@@ -5,7 +5,7 @@ if test -x "$CHARMINC/MPIOPTS"
 then
   . $CHARMINC/MPIOPTS
 else
-  MPICXX_DEF=mpiCC
+  MPICXX_DEF=mpicxx
   MPICC_DEF=mpicc
 fi
 
@@ -22,7 +22,7 @@ fi
 CMK_REAL_COMPILER=`$MPICXX -show 2>/dev/null | cut -d' ' -f1 `
 case "$CMK_REAL_COMPILER" in
 g++) CMK_AMD64="-m64 -fPIC" ;;
-charmc)  echo "Error> charmc can not call AMPI's mpiCC wrapper! Please fix your PATH."; exit 1 ;;
+charmc)  echo "Error> charmc can not call AMPI's mpicxx/mpiCC wrapper! Please fix your PATH."; exit 1 ;;
 esac
 
 CMK_CPP_CHARM="/lib/cpp -P"
index f65c4997f52a6117c6a6ca75af0a07869c189a0e..bced448bb748466b0d5d237fd22e7bc7ee65a56b 100644 (file)
@@ -1,8 +1,8 @@
 CMK_CPP_CHARM='/lib/cpp -P'
 CMK_CPP_C='mpicc -E'
 CMK_CC='mpicc '
-CMK_CXX='mpiCC '
-CMK_CXXPP='mpiCC -E '
+CMK_CXX='mpicxx '
+CMK_CXXPP='mpicxx -E '
 CMK_RANLIB='ranlib'
 CMK_LIBS='-lckqt '
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"