Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@honest1.ncsa.uiuc.edu>
Fri, 18 Mar 2011 21:29:11 +0000 (16:29 -0500)
committerGengbin Zheng <gzheng@honest1.ncsa.uiuc.edu>
Fri, 18 Mar 2011 21:29:11 +0000 (16:29 -0500)
src/arch/common/cc-iccstatic.sh

index 7eba56023e02946ef70fd04994a755c5e1a5bd43..05faa552fbab56d8eccd6227d9d13ed63032448f 100644 (file)
@@ -21,12 +21,20 @@ CMK_CXXPP='icpc -E '
 CMK_LD="icc $ICCOPTS"
 CMK_LDXX="icpc $ICCOPTS"
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
+
 CMK_CF90='ifc -auto '
 CMK_CF90_FIXED="$CMK_CF90 -132 -FI "
-CMK_NATIVE_F90="$CMK_CF90"
+CMK_F90LIBS='-L/usr/local/intel/compiler70/ia32/lib -L/opt/intel/compiler70/ia32/lib -lintrins -lIEPCF90 -lF90 -lintrins -limf  '
+CMK_F90_USE_MODDIR=""
+
 CMK_NATIVE_CC="$CMK_CC"
 CMK_NATIVE_CXX="$CMK_CXX"
 CMK_NATIVE_LD="$CMK_LD"
 CMK_NATIVE_LDXX="$CMK_LDXX"
-CMK_F90LIBS='-L/usr/local/intel/compiler70/ia32/lib -L/opt/intel/compiler70/ia32/lib -lintrins -lIEPCF90 -lF90 -lintrins -limf  '
-CMK_F90_USE_MODDIR=""
+CMK_NATIVE_F90="$CMK_CF90"
+
+CMK_SEQ_CC="$CMK_NATIVE_CC"
+CMK_SEQ_CXX="$CMK_NATIVE_CXX"
+CMK_SEQ_LD="$CMK_NATIVE_LD"
+CMK_SEQ_LDXX="$CMK_NATIVE_LDXX"
+