- Finalize ornl_configure

This commit was SVN r22178.

contrib/platform/ornl/ornl_configure_self_contained

@@ -35,7 +35,7 @@ fi
 
 # If the env flags are not set, initialize to default...
 SRCDIR=${SRCDIR:-..}
-COMPILER=${COMPILER:-gcc}
+COMPILER=${COMPILER:-gnu}
 INSTALL_ROOT=${INSTALL_ROOT:-/sw/xt5/ompi}
 VERSION=${VERSION:-"`${SRCDIR}/config/ompi_get_version.sh ${SRCDIR}/VERSION`"}
 SVER=${SVER:-"cnl`echo "${XTOS_VERSION}" | cut -c1-3`"}
@@ -48,20 +48,26 @@ PREFIX=${PREFIX:-${INSTALL_ROOT}/${VERSION}/${SVER}_${CVER}}
 case "$COMPILER" in
     "cray" )
         ADD_COMPILER="CC=craycc CXX=crayc++ F77=crayftn FC=crayftn"
+        # Static compilation is the default, there is not even a flag...
+        ADD_WRAPPER_LDFLAGS=""
         ;;
-    "gcc" )
+    "gnu" )
+        ADD_WRAPPER_LDFLAGS="-static "
         ;;
     "intel" )
         ADD_COMPILER="CC=icc CXX=icpc F77=ifort FC=ifort"
+        ADD_WRAPPER_LDFLAGS="-static "
         ;;
     "pathscale" )
         ADD_COMPILER="CC=pathcc CXX=pathCC F77=pathf90 FC=pathf90"
+        ADD_WRAPPER_LDFLAGS="-static "
         ;;
     "pgi" )
         ADD_COMPILER="CC=pgcc CXX=pgCC F77=pgf77 FC=pgf90"
         ADD_FFLAGS="-Mnomain $PGI/linux86-64/default/lib/pgfmain.o "
         ADD_FCFLAGS="-Mnomain $PGI/linux86-64/default/lib/pgfmain.o "
         ADD_LDFLAGS="-L$PGI/linux86-64/default/lib "
+        ADD_WRAPPER_LDFLAGS="-Bstatic "
         ;;
     * )
         echo "Error: Unknown Compiler: $COMPILER"
@@ -75,7 +81,7 @@ $SRCDIR/configure \
    --with-threads --with-memory-manager=none \
    --without-tm --with-alps --with-portals --with-portals-config=cnl_modex \
    --enable-mca-no-build=timer-catamount,maffinity-first_use,maffinity-libnuma,ess-cnos,filem-rsh,grpcomm-cnos,pml-dr \
-   --with-wrapper-ldflags="-static -L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib" \
+   --with-wrapper-ldflags="${ADD_WRAPPER_LDFLAGS}-L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib" \
    --with-wrapper-libs="-lpct -lalpslli -lalpsutil -lportals -lpthread -lm" \
    ${ADD_COMPILER} \
    CPPFLAGS="${ADD_CPPFLAGS}-I${CATAMOUNT_DIR}/catamount/linux/include -I${PE_DIR}/include" \

orte/mca/ras/alps/ras-alps-command.sh

@@ -12,7 +12,7 @@
   APSTAT=/usr/bin/apstat
   GREP=/usr/bin/grep
   AWK=/usr/bin/awk
-  SLEEP=/usr/bin/sleep
+  SLEEP=/bin/sleep
   ECHO=/bin/echo
 
 # If the old variable still is being set, use it.