Commit 333168e9 authored by Philip Carns's avatar Philip Carns

propigate darshan-gen-fortran bug fix to darshan-gen-cxx for runtime

detection of what libcxxmpich library to use


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@329 3b7491f3-a168-0410-bf4b-c445ed680a29
parent 3fe69a54
...@@ -63,7 +63,7 @@ open (OUTPUT, ">$output_file") || die("Error opening output file: $!"); ...@@ -63,7 +63,7 @@ open (OUTPUT, ">$output_file") || die("Error opening output file: $!");
# substitute arguments and darshan options into commands # substitute arguments and darshan options into commands
$base_link_cmd = $link_cmd; $base_link_cmd = $link_cmd;
$base_link_cmd =~ s/foo.o -o foo/"\$\{allargs\[\@\]\}"/g; $base_link_cmd =~ s/foo.o -o foo/"\$\{allargs\[\@\]\}"/g;
$link_cmd =~ s/foo.o -o foo/"\$\{newallargs\[\@\]\}" -L$DARSHAN_LIB_PATH $CP_ZLIB_LINK_FLAGS -ldarshan-mpi-io -lz $CP_WRAPPERS/g; $link_cmd =~ s/foo.o -o foo/"\$\{newallargs\[\@\]\}" -L$DARSHAN_LIB_PATH $CP_ZLIB_LINK_FLAGS \$CXXMPICH -ldarshan-mpi-io -lz $CP_WRAPPERS/g;
$link_cmd =~ s/$/ -L$DARSHAN_LIB_PATH -ldarshan-posix/g; $link_cmd =~ s/$/ -L$DARSHAN_LIB_PATH -ldarshan-posix/g;
$compile_cmd =~ s/-c foo.c/"\$\{allargs\[\@\]\}"/g; $compile_cmd =~ s/-c foo.c/"\$\{allargs\[\@\]\}"/g;
...@@ -164,16 +164,12 @@ print OUTPUT<<"EOF"; ...@@ -164,16 +164,12 @@ print OUTPUT<<"EOF";
rc_pmpi=\$? rc_pmpi=\$?
# normal or cnk libraries? # normal or cnk libraries?
grep -E mpich\\.cnk\\.a \$tmpfile >& /dev/null grep -E mpich\\.cnk \$tmpfile >& /dev/null
rc_cnk_check=\$? rc_cnk_check=\$?
if [ \$rc_cnk_check -eq 0 ] ; then if [ \$rc_cnk_check -eq 0 ] ; then
argno=0 CXXMPICH=-lcxxmpich.cnk
for arg in "\$\{newallargs\[\@\]\}"; do else
if [ "\$arg" = "-lcxxmpich" ]; then CXXMPICH=-lcxxmpich
newallargs[\$argno]=-lcxxmpich.cnk;
fi
argno=`expr \$argno + 1`
done
fi fi
rm \$tmpfile >& /dev/null rm \$tmpfile >& /dev/null
......
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