Merge optimizations/fixes/changes from pami-bgq branch.
[charm.git] / src / arch / pami-bluegeneq / cc-xlc.sh
index c99c5961fabe4fa87c8eabe6a37f06b1de7dbb72..989bb6bc2f6a1fa552fc7cf00823bbeef78cba96 100644 (file)
@@ -1,9 +1,8 @@
-XLC_TYPICAL_PRE=/soft/compilers/ibmcmp-feb2012/
+XLC_TYPICAL_PRE=/opt/ibmcmp/vacpp/bg/12.1/
 XLC_PRE=$XLC_TYPICAL_PRE
 
 XLC_PRE=$XLC_TYPICAL_PRE
 
-XLC_TYPICAL_POST_BG=vacpp/bg/12.1/bin/bg
-XLC_TYPICAL_POST=vacpp/bg/12.1/bin
-XLC_POST=$XLC_TYPICAL_POST_BG
+XLC_TYPICAL_POST=bin/bg
+XLC_POST=$XLC_TYPICAL_POST
 
 # if no floor set, use typical floor path
 if test -n "$BGQ_XLC_PRE"
 
 # if no floor set, use typical floor path
 if test -n "$BGQ_XLC_PRE"
@@ -11,14 +10,14 @@ then
   XLC_PRE=$BGQ_XLC_PRE
 fi
 
   XLC_PRE=$BGQ_XLC_PRE
 fi
 
-XLC_F=$XLC_PRE/xlf/bg/14.1/bin
+XLC_F=$XLC_PRE/xlf/bg/11.1/
 CMK_CC="$XLC_PRE/${XLC_POST}xlc_r -qcpluscmt -qhalt=e $BGQ_INC"
 CMK_CXX="$XLC_PRE/${XLC_POST}xlC_r -qhalt=e $BGQ_INC"
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
 CMK_CC="$XLC_PRE/${XLC_POST}xlc_r -qcpluscmt -qhalt=e $BGQ_INC"
 CMK_CXX="$XLC_PRE/${XLC_POST}xlC_r -qhalt=e $BGQ_INC"
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
-CMK_CF77="$XLC_F/bgxlf "
-CMK_CF90="$XLC_F/bgxlf90  -qsuffix=f=f90" 
-CMK_CF90_FIXED="$XLC_F/bgxlf90 " 
+CMK_CF77="$XLC_F/${XLC_POST}xlf "
+CMK_CF90="$XLC_F/${XLC_POST}xlf90  -qsuffix=f=f90" 
+CMK_CF90_FIXED="$XLC_PRE/xlf/8.1/${XLC_POST}xlf90 " 
 CMK_C_OPTIMIZE='-O3 -Q'
 CMK_CXX_OPTIMIZE='-O3 -Q'
 CMK_AR='ar cq'
 CMK_C_OPTIMIZE='-O3 -Q'
 CMK_CXX_OPTIMIZE='-O3 -Q'
 CMK_AR='ar cq'