Commit 715a8325 authored by Philip Carns's avatar Philip Carns

finished filling in darshan modifications to all compilers; needs

testing


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@69 3b7491f3-a168-0410-bf4b-c445ed680a29
parent eaf7f5aa
......@@ -251,7 +251,19 @@ if [ "$linking" = yes ] ; then
# prepend the path for the shared libraries to the library list
mpilibs="$C_LINKPATH_SHL$libdir $mpilibs"
fi
$Show $CC "${allargs[@]}" -I$includedir $CFLAGS $LDFLAGS -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS
# check to see if the command line refers to any profilers that might
# use PMPI.
profiler_check=`echo "${allargs[@]}" | ${DARSHAN_BIN_PATH}/darshan-pmpi-filter.sh`
if [ "$profiler_check" = "" ] ; then
$Show $CC "${allargs[@]}" -L${DARSHAN_LIB_PATH} \
${CP_ZLIB_LINK_FLAGS} -ldarshan-mpi-io -lz -I$includedir $CFLAGS \
${CP_WRAPPERS} $LDFLAGS -L$libdir -L$opalibdir $mpilibs \
$MPI_OTHERLIBS -L${DARSHAN_LIB_PATH} -ldarshan-posix
else
# it looks like the user wants to use another tool with PMPI; don't
# link in Darshan PMPI wrappers (disables Darshan)
$Show $CC "${allargs[@]}" -I$includedir $CFLAGS $LDFLAGS -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS
fi
rc=$?
else
$Show $CC "${allargs[@]}" -I$includedir $CFLAGS
......
......@@ -251,7 +251,19 @@ if [ "$linking" = yes ] ; then
# Prepend the path for the shared libraries to the library list
shllibpath="$CXX_LINKPATH_SHL$libdir"
fi
$Show $CXX "${allargs[@]}" -I$includedir $CXXFLAGS $LDFLAGS -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
# check to see if the command line refers to any profilers that might
# use PMPI.
profiler_check=`echo "${allargs[@]}" | ${DARSHAN_BIN_PATH}/darshan-pmpi-filter.sh`
if [ "$profiler_check" = "" ] ; then
$Show $CXX "${allargs[@]}" -L${DARSHAN_LIB_PATH} \
${CP_ZLIB_LINK_FLAGS} -ldarshan-mpi-io -lz -I$includedir $CXXFLAGS \
${CP_WRAPPERS} $LDFLAGS -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs \
$MPI_OTHERLIBS -L${DARSHAN_LIB_PATH} -ldarshan-posix
else
# it looks like the user wants to use another tool with PMPI; don't
# link in Darshan PMPI wrappers (disables Darshan)
$Show $CXX "${allargs[@]}" -I$includedir $CXXFLAGS $LDFLAGS -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
fi
rc=$?
else
$Show $CXX "${allargs[@]}" -I$includedir $CXXFLAGS
......
......@@ -251,7 +251,19 @@ if [ "$linking" = yes ] ; then
# prepend the path for the shared libraries to the library list
mpilibs="$C_LINKPATH_SHL$libdir $mpilibs"
fi
$Show $CC "${allargs[@]}" -I$includedir $CFLAGS $LDFLAGS -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS
# check to see if the command line refers to any profilers that might
# use PMPI.
profiler_check=`echo "${allargs[@]}" | ${DARSHAN_BIN_PATH}/darshan-pmpi-filter.sh`
if [ "$profiler_check" = "" ] ; then
$Show $CC "${allargs[@]}" -L${DARSHAN_LIB_PATH} \
${CP_ZLIB_LINK_FLAGS} -ldarshan-mpi-io -lz -I$includedir $CFLAGS \
${CP_WRAPPERS} $LDFLAGS -L$libdir -L$opalibdir $mpilibs \
$MPI_OTHERLIBS -L${DARSHAN_LIB_PATH} -ldarshan-posix
else
# it looks like the user wants to use another tool with PMPI; don't
# link in Darshan PMPI wrappers (disables Darshan)
$Show $CC "${allargs[@]}" -I$includedir $CFLAGS $LDFLAGS -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS
fi
rc=$?
else
$Show $CC "${allargs[@]}" -I$includedir $CFLAGS
......
......@@ -251,7 +251,19 @@ if [ "$linking" = yes ] ; then
# prepend the path for the shared libraries to the library list
mpilibs="$C_LINKPATH_SHL$libdir $mpilibs"
fi
$Show $CC "${allargs[@]}" -I$includedir $CFLAGS $LDFLAGS -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS
# check to see if the command line refers to any profilers that might
# use PMPI.
profiler_check=`echo "${allargs[@]}" | ${DARSHAN_BIN_PATH}/darshan-pmpi-filter.sh`
if [ "$profiler_check" = "" ] ; then
$Show $CC "${allargs[@]}" -L${DARSHAN_LIB_PATH} \
${CP_ZLIB_LINK_FLAGS} -ldarshan-mpi-io -lz -I$includedir $CFLAGS \
${CP_WRAPPERS} $LDFLAGS -L$libdir -L$opalibdir $mpilibs \
$MPI_OTHERLIBS -L${DARSHAN_LIB_PATH} -ldarshan-posix
else
# it looks like the user wants to use another tool with PMPI; don't
# link in Darshan PMPI wrappers (disables Darshan)
$Show $CC "${allargs[@]}" -I$includedir $CFLAGS $LDFLAGS -L$libdir -L$opalibdir $mpilibs $MPI_OTHERLIBS
fi
rc=$?
else
$Show $CC "${allargs[@]}" -I$includedir $CFLAGS
......
......@@ -251,7 +251,19 @@ if [ "$linking" = yes ] ; then
# Prepend the path for the shared libraries to the library list
shllibpath="$CXX_LINKPATH_SHL$libdir"
fi
$Show $CXX "${allargs[@]}" -I$includedir $CXXFLAGS $LDFLAGS -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
# check to see if the command line refers to any profilers that might
# use PMPI.
profiler_check=`echo "${allargs[@]}" | ${DARSHAN_BIN_PATH}/darshan-pmpi-filter.sh`
if [ "$profiler_check" = "" ] ; then
$Show $CXX "${allargs[@]}" -L${DARSHAN_LIB_PATH} \
${CP_ZLIB_LINK_FLAGS} -ldarshan-mpi-io -lz -I$includedir $CXXFLAGS \
${CP_WRAPPERS} $LDFLAGS -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs \
$MPI_OTHERLIBS -L${DARSHAN_LIB_PATH} -ldarshan-posix
else
# it looks like the user wants to use another tool with PMPI; don't
# link in Darshan PMPI wrappers (disables Darshan)
$Show $CXX "${allargs[@]}" -I$includedir $CXXFLAGS $LDFLAGS -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
fi
rc=$?
else
$Show $CXX "${allargs[@]}" -I$includedir $CXXFLAGS
......
......@@ -251,7 +251,19 @@ if [ "$linking" = yes ] ; then
# Prepend the path for the shared libraries to the library list
shllibpath="$CXX_LINKPATH_SHL$libdir"
fi
$Show $CXX "${allargs[@]}" -I$includedir $CXXFLAGS $LDFLAGS -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
# check to see if the command line refers to any profilers that might
# use PMPI.
profiler_check=`echo "${allargs[@]}" | ${DARSHAN_BIN_PATH}/darshan-pmpi-filter.sh`
if [ "$profiler_check" = "" ] ; then
$Show $CXX "${allargs[@]}" -L${DARSHAN_LIB_PATH} \
${CP_ZLIB_LINK_FLAGS} -ldarshan-mpi-io -lz -I$includedir $CXXFLAGS \
${CP_WRAPPERS} $LDFLAGS -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs \
$MPI_OTHERLIBS -L${DARSHAN_LIB_PATH} -ldarshan-posix
else
# it looks like the user wants to use another tool with PMPI; don't
# link in Darshan PMPI wrappers (disables Darshan)
$Show $CXX "${allargs[@]}" -I$includedir $CXXFLAGS $LDFLAGS -L$libdir -L$opalibdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
fi
rc=$?
else
$Show $CXX "${allargs[@]}" -I$includedir $CXXFLAGS
......
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