use gfortran instead of g77.
authorGengbin Zheng <gzheng@gzheng-desktop.(none)>
Tue, 16 Feb 2010 06:36:26 +0000 (00:36 -0600)
committerGengbin Zheng <gzheng@gzheng-desktop.(none)>
Tue, 16 Feb 2010 06:36:26 +0000 (00:36 -0600)
src/arch/common/conv-mach-gfortran.sh
src/arch/net-linux/conv-mach.sh

index b6fa0417d91dd33134aa6b6ef89f1a87cb46371f..86dee635a2b36db045415053c39582eb1e168241 100644 (file)
@@ -6,16 +6,18 @@ CMK_CXX="$CMK_CXX -DCMK_GFORTRAN"
 if test -n "$CMK_MACOSX64"
 then
 CMK_F90FLAGS="$CMK_F90FLAGS -m64"
+CMK_F77FLAGS="$CMK_F90FLAGS -m64"
 fi
 
 if test -n "$CMK_MACOSX"
 then
 CMK_F90FLAGS="$CMK_F90FLAGS -fno-common"
+CMK_F77FLAGS="$CMK_F90FLAGS -fno-common"
 fi
 
-CMK_CF77="g77 "
-CMK_CF90=`which gfortran 2>/dev/null`
 CMK_FPP="/lib/cpp -P -CC"
+
+CMK_CF90=`which gfortran 2>/dev/null`
 CMK_CF90="$CMK_CF90 $CMK_F90FLAGS -fPIC -fno-second-underscore -fdollar-ok" 
 CMK_CF90_FIXED="$CMK_CF90 -ffixed-form "
 # find f90 library:
@@ -42,6 +44,9 @@ else
 fi
 test -n "$F90LIBDIR" && CMK_F90LIBS="-L$F90LIBDIR -lgfortran -lgcc_eh"
 
+CMK_CF77=$CMK_CF90
+CMK_F77LIBS=$CMK_F90LIBS
+
 CMK_MOD_NAME_ALLCAPS=
 CMK_MOD_EXT="mod"
 CMK_F90_USE_MODDIR=1
index 7e4856bd53b0717b4e3710ab7cdd60fc33b1af17..493d13fd27e99163dd2e865725f49e9eba9e78c2 100644 (file)
@@ -14,6 +14,12 @@ CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
 CMK_XIOPTS=""
 CMK_QT="i386-gcc"
 
+CMK_CF90=`which f95 2>/dev/null`
+if test -n "$CMK_CF90"
+then
+    . $CHARMINC/conv-mach-gfortran.sh
+else
+
 # fortran compiler f77 or gnu f95
 CMK_CF77=`which g77 2>/dev/null`
 if test -z "$CMK_CF77"
@@ -46,3 +52,5 @@ else
     CMK_F90_MODINC="-I"
   fi
 fi
+
+fi