Bring mpi-linux-i386 and mpi-linux-ppc64le in line with mpi-linux-x86_64

Author: evan-charmworks

CMakeLists.txt

@@ -573,7 +573,6 @@ configure_file(src/arch/common/cc-iccstatic.sh               include/ COPYONLY)
 configure_file(src/arch/common/cc-iccstatic.h                include/ COPYONLY)
 configure_file(src/arch/common/cc-gcc.sh                     include/ COPYONLY)
 configure_file(src/arch/common/cc-gcc.h                      include/ COPYONLY)
-configure_file(src/arch/common/cc-mpi.sh                     include/ COPYONLY)
 configure_file(src/arch/common/cc-mpiopts.sh                 include/ COPYONLY)
 configure_file(src/arch/common/cc-msvc.h                     include/ COPYONLY)
 configure_file(src/arch/common/cc-msvc.sh                    include/ COPYONLY)

src/arch/common/cc-mpi.sh

@@ -30,4 +30,4 @@ CMK_DEFS="$CMK_DEFS -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX"
 
 CMK_LIBS="-lckqt $CMK_SYSLIBS "
 CMK_QT='generic64-light'
-CMK_RANLIB='ranlib'
+CMK_RANLIB='ranlib'

src/arch/common/cc-mpiopts.sh

@@ -1,16 +1,38 @@
 CMK_DEFS="$CMK_DEFS -m32"
 CMK_FDEFS="$CMK_FDEFS -m32"
 
-. $CHARMINC/cc-mpi.sh
+. $CHARMINC/cc-mpiopts.sh
 
 CMK_QT='i386-gcc'
 
-CMK_NATIVE_CC='gcc '
-CMK_NATIVE_CXX='g++ '
+
+CMK_CC="$MPICC"
+CMK_CXX="$MPICXX"
+
+CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
+
+CMK_NATIVE_CC='gcc'
+CMK_NATIVE_CXX='g++'
 CMK_NATIVE_LD='gcc'
 CMK_NATIVE_LDXX='g++'
 CMK_NATIVE_LIBS=''
 
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_F90LIBS='-L/usr/absoft/lib -L/opt/absoft/lib -lf90math -lfio -lU77 -lf77math '
+CMK_NATIVE_FLAGS='-fPIC'
+
+CMK_NATIVE_CC_FLAGS="$CMK_NATIVE_FLAGS"
+CMK_NATIVE_LD_FLAGS="$CMK_NATIVE_FLAGS"
+CMK_NATIVE_CXX_FLAGS="$CMK_NATIVE_FLAGS"
+CMK_NATIVE_LDXX_FLAGS="$CMK_NATIVE_FLAGS"
+
+# Fortran
+CMK_CXX_IS_GCC=`$MPICXX -V 2>&1 | grep 'g++' `
+CMK_CXX_IS_ICC=`$MPICXX -V 2>&1 | grep Intel `
+if test -n "$CMK_CXX_IS_GCC"
+then
+    . $CHARMINC/conv-mach-gfortran.sh
+elif test -n "$CMK_CXX_IS_ICC"
+then
+    . $CHARMINC/conv-mach-ifort.sh
+fi
+
+CMK_COMPILER='mpicc'

src/arch/mpi-linux-i386/conv-mach.sh

@@ -1,15 +1,35 @@
-. $CHARMINC/cc-mpi.sh
+. $CHARMINC/cc-mpiopts.sh
 
 CMK_QT='generic64-light'
 
+
+CMK_CC="$MPICC"
+CMK_CXX="$MPICXX"
+
+CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
+
+CMK_NATIVE_CC='gcc'
+CMK_NATIVE_CXX='g++'
+CMK_NATIVE_LD='gcc'
+CMK_NATIVE_LDXX='g++'
 CMK_NATIVE_LIBS=''
-CMK_NATIVE_CC='xlc_r '
-CMK_NATIVE_LD='xlc_r '
-CMK_NATIVE_CXX='xlC_r '
-CMK_NATIVE_LDXX='xlC_r '
-
-CMK_CF77='mpif77 '
-CMK_CF90='mpif90 '
-CMK_F90LIBS='-L/opt/absoft/lib -lf90math -lfio -lU77 -lf77math '
-CMK_MOD_NAME_ALLCAPS=1
-CMK_MOD_EXT='mod'
+
+CMK_NATIVE_FLAGS='-fPIC'
+
+CMK_NATIVE_CC_FLAGS="$CMK_NATIVE_FLAGS"
+CMK_NATIVE_LD_FLAGS="$CMK_NATIVE_FLAGS"
+CMK_NATIVE_CXX_FLAGS="$CMK_NATIVE_FLAGS"
+CMK_NATIVE_LDXX_FLAGS="$CMK_NATIVE_FLAGS"
+
+# Fortran
+CMK_CXX_IS_GCC=`$MPICXX -V 2>&1 | grep 'g++' `
+CMK_CXX_IS_ICC=`$MPICXX -V 2>&1 | grep Intel `
+if test -n "$CMK_CXX_IS_GCC"
+then
+    . $CHARMINC/conv-mach-gfortran.sh
+elif test -n "$CMK_CXX_IS_ICC"
+then
+    . $CHARMINC/conv-mach-ifort.sh
+fi
+
+CMK_COMPILER='mpicc'