Commit 657e1b1a authored by Shane Snyder's avatar Shane Snyder

bug fix and makefile cleanup

parent b2b9fcbe
......@@ -13,7 +13,7 @@ DARSHAN_LD_FLAGS="@LDFLAGS@"
# TODO: extra -lmpi in POST_LD_FLAGS -- link ordering issue
PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan -lz $CP_WRAPPERS"
POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan -lmpi -lz -lrt -lpthread"
POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan -lz -lrt -lpthread"
usage="\
Usage: darshan-config [--pre-ld-flags] [--post-ld-flags]"
......
......@@ -208,6 +208,7 @@ print OUTPUT<<"EOF";
# if allargs includes any libraries, then we need to get
# -ldarshan-mpi-io in there first
# TODO: changing -ldarshan-mpi-io to -ldarshan OK ?
argno=0;
once=0;
compiler_check=0;
......@@ -215,7 +216,7 @@ print OUTPUT<<"EOF";
for arg in "\$\{newallargs\[\@\]\}"; do
res=`expr match "\$arg" "-l"`;
if [ \$res -gt 0 -a \$once -lt 1 ]; then
newallargs[\$argno]=-ldarshan-mpi-io
newallargs[\$argno]=-ldarshan
argno=`expr \$argno + 1`
newallargs[\$argno]=\$arg;
once=1;
......
......@@ -472,7 +472,7 @@ static void darshan_core_shutdown()
if(internal_timing_flag)
mod1[i] = DARSHAN_MPI_CALL(PMPI_Wtime)();
/* if all processes used this module, prepare to do a shared file reduction */
if(global_mod_use_count[j] == nprocs)
if(global_mod_use_count[i] == nprocs)
{
int shared_rec_count = 0;
int rec_sz = 0;
......
......@@ -96,7 +96,7 @@ install:: all
install -d $(includedir)
install -d $(pkgconfigdir)
# install -m 755 darshan-parser $(bindir)
# install -m 755 darshan-posix-parser $(bindir)
install -m 755 darshan-posix-parser $(bindir)
# install -m 755 darshan-convert $(bindir)
# install -m 755 darshan-diff $(bindir)
# install -m 755 darshan-analyzer $(bindir)
......
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