Merge branch 'charm' of charmgit:charm into charm
authorEric Bohm <ebohm@illinois.edu>
Fri, 23 Jul 2010 23:24:09 +0000 (18:24 -0500)
committerEric Bohm <ebohm@illinois.edu>
Fri, 23 Jul 2010 23:24:09 +0000 (18:24 -0500)
src/arch/bluegenep/cc-xlc.sh

index 22feae18e948aca1a8a70373ad0a50df9c77599a..cc4825c10155e1d3ceceda6b3c0cdc314f490338 100644 (file)
@@ -1,4 +1,4 @@
-XLC_PRE=/soft/apps/ibmcmp-jan2010
+XLC_PRE=/soft/apps/ibmcmp
 XLC_POST=bin/bg
 XLC_F=$XLC_PRE/xlf/bg/11.1
 CMK_CC="$XLC_PRE/vac/bg/9.0/${XLC_POST}xlc -qcpluscmt -qhalt=e -I$CHARMINC $BGP_INC"
@@ -7,7 +7,7 @@ CMK_LD="$CMK_CC $BGP_LIB "
 CMK_LDXX="$CMK_CXX $BGP_LIB"
 CMK_CF77="$XLC_F/${XLC_POST}xlf "
 CMK_CF90="$XLC_F/${XLC_POST}xlf90  -qsuffix=f=f90" 
-CMK_CF90_FIXED="$XLC_PRE/xlf/11.1/${XLC_POST}xlf90 " 
+CMK_CF90_FIXED="$XLC_PRE/xlf/bg/11.1/${XLC_POST}xlf90 " 
 CMK_C_OPTIMIZE='-O3 -qstrict -Q  '
 CMK_CXX_OPTIMIZE='-O3 -qstrict -Q '
 CMK_AR='ar cq'