Commit d1d284e0 authored by Kevin Harms's avatar Kevin Harms
Browse files

fixes for previous commit; correct MPICH_* handling in wrapper generators,...

fixes for previous commit; correct MPICH_* handling in wrapper generators, uncomments code in test script that should not have been commented out.

git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@695 3b7491f3-a168-0410-bf4b-c445ed680a29
parent 40865309
...@@ -117,9 +117,9 @@ print OUTPUT<<"EOF"; ...@@ -117,9 +117,9 @@ print OUTPUT<<"EOF";
# Show is set to echo to cause the compilation command to be echoed instead # Show is set to echo to cause the compilation command to be echoed instead
# of executed. # of executed.
Show= Show=
CC=${CC:-"$CC"} CC=\${CC:-"$CC"}
if [ -n "$MPICH_CC" ] ; then if [ -n "\$MPICH_CC" ] ; then
CC="$MPICH_CC" CC=\$MPICH_CC
fi fi
EOF EOF
......
...@@ -117,9 +117,9 @@ print OUTPUT<<"EOF"; ...@@ -117,9 +117,9 @@ print OUTPUT<<"EOF";
# Show is set to echo to cause the compilation command to be echoed instead # Show is set to echo to cause the compilation command to be echoed instead
# of executed. # of executed.
Show= Show=
CXX=${CXX:-"$CXX"} CXX=\${CXX:-"$CXX"}
if [ -n "$MPICH_CC" ] ; then if [ -n "\$MPICH_CC" ] ; then
CXX="$MPICH_CXX" CXX=\$MPICH_CXX
fi fi
EOF EOF
......
...@@ -117,9 +117,9 @@ print OUTPUT<<"EOF"; ...@@ -117,9 +117,9 @@ print OUTPUT<<"EOF";
# Show is set to echo to cause the compilation command to be echoed instead # Show is set to echo to cause the compilation command to be echoed instead
# of executed. # of executed.
Show= Show=
FC=${F77:-"$FC"} FC=\${F77:-"$FC"}
if [ -n "$MPICH_F77" ] ; then if [ -n "\$MPICH_F77" -o -n "\$MPICH_F90" ] ; then
FC="$MPICH_F77" FC=\${MPICH_F90:-\$MPICH_F77}
fi fi
EOF EOF
......
...@@ -56,10 +56,10 @@ CXXFLAGS="-g -DHAVE_CXX_IOSTREAM -DHAVE_NAMESPACE_STD" ...@@ -56,10 +56,10 @@ CXXFLAGS="-g -DHAVE_CXX_IOSTREAM -DHAVE_NAMESPACE_STD"
LDFLAGS="" LDFLAGS=""
LIBS="" LIBS=""
FLIBS="" FLIBS=""
#for compile_type in gcc gcc.legacy xl xl.legacy xl.legacy.ndebug xl.ndebug; for compile_type in gcc gcc.legacy xl xl.legacy xl.legacy.ndebug xl.ndebug;
#do do
# compile_examples $compile_type out/normal compile_examples $compile_type out/normal
#done done
# tests with another pmpi library taking precedence # tests with another pmpi library taking precedence
CFLAGS="-g" CFLAGS="-g"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment