[Darshan-commits] [Darshan] branch, master, updated. darshan-2.3.1-pre1-17-gd3b6727

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".

The branch, master has been updated
       via  d3b6727c3f6a58980d1f07abca6ff8ba64d84c3e (commit)
      from  fa863d34fa1ffe4944d4d8608997f54b24b2c1f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d3b6727c3f6a58980d1f07abca6ff8ba64d84c3e
Author: Phil Carns <carns at mcs.anl.gov>
Date:   Thu Feb 5 17:51:03 2015 -0500

    fix library name for mpich 3.1.1+ cxx builds

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                             |    4 ++--
 darshan-runtime/darshan-gen-cxx.pl.in |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)


Diff of changes:
diff --git a/ChangeLog b/ChangeLog
index d7c4e58..bbdbc8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,8 +25,8 @@ darshan-2.3.1-pre2
   - label I/O vs. meta time more clearly
   - include unique file meta time in agg_perf_by_slowest calculation
 * added regression test script framework in darshan-test/regression/
-* update darshan-gen-fortran.pl to support new Fortran library name in 
-  MPICH 3.1.1
+* update darshan-gen-fortran.pl and darshan-gen-cxx.pl to support new library
+  naming conventions in MPICH 3.1.1 and higher
 
 darshan-2.3.0
 =============
diff --git a/darshan-runtime/darshan-gen-cxx.pl.in b/darshan-runtime/darshan-gen-cxx.pl.in
index b213a9a..3a9c41e 100644
--- a/darshan-runtime/darshan-gen-cxx.pl.in
+++ b/darshan-runtime/darshan-gen-cxx.pl.in
@@ -274,10 +274,14 @@ print OUTPUT<<"EOF";
     if [ \$? -eq 0 ] ; then
         CXXMPICH=-lcxxmpich
     fi
-    grep -E cxxmpich\\.cnk.a \$tmpfile >& /dev/null
+    grep -E cxxmpich\\.cnk\\.a \$tmpfile >& /dev/null
     if [ \$? -eq 0 ] ; then
         CXXMPICH=-lcxxmpich.cnk
     fi
+    grep -E mpicxx\\.a \$tmpfile >& /dev/null
+    if [ \$? -eq 0 ] ; then
+        CXXMPICH=-lmpicxx
+    fi
 
     rm \$tmpfile >& /dev/null
 


hooks/post-receive
--