revise cray module file to use new mechanism for injecting Darshan

instrumentation without compiler script modifications


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@723 3b7491f3-a168-0410-bf4b-c445ed680a29

darshan-runtime/share/cray/cray-xt-asyncpe-5.10-darshan.patch

-diff -Naupr asyncpe-bin-orig/crayc++ asyncpe-bin/crayc++
---- asyncpe-bin-orig/crayc++	2012-08-10 05:23:25.127227000 -0700
-+++ asyncpe-bin/crayc++	2012-08-10 05:34:35.586983719 -0700
-@@ -1527,6 +1527,28 @@ else
-      LIBPNETCDF=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$XTPE_LINK_TYPE" != "dynamic" ] ; then
-+      LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+      DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+      DARSHAN_POST_LINK_OPTS="-lmpichcxx ${DARSHAN_POST_LINK_OPTS}"
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -1735,6 +1757,12 @@ if [ -f ${BUILD_OPTS} ] ; then
- 	eval $($BUILD_OPTS)
- fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
-+
- _RUN_OPTIONS="$compile_opts $PRE_COMPILE_OPTS $PRE_LINK_OPTS \
-      "$@" -hlast_user_arg \
-      -nostdinc \
-diff -Naupr asyncpe-bin-orig/craycc asyncpe-bin/craycc
---- asyncpe-bin-orig/craycc	2012-08-10 05:23:25.129673000 -0700
-+++ asyncpe-bin/craycc	2012-08-10 05:25:55.150733538 -0700
-@@ -1436,6 +1436,27 @@ else
-      LIBPNETCDF=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$XTPE_LINK_TYPE" != "dynamic" ] ; then
-+      LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+      DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -1652,6 +1673,11 @@ if [ -f ${BUILD_OPTS} ] ; then
- 	eval $($BUILD_OPTS)
- fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- _RUN_OPTIONS="$compile_opts $PRE_COMPILE_OPTS $PRE_LINK_OPTS "$@" -hlast_user_arg \
-      -nostdinc \
-      $INCLUDE_OPTS ${COMPILER_INCLUDE} ${INC_PATH} ${GCC_XX_INCLUDE_PATH_LIST} ${GCC_BASE} $SYSROOT $SYSROOT_INC_PATH \
-diff -Naupr asyncpe-bin-orig/crayftn asyncpe-bin/crayftn
---- asyncpe-bin-orig/crayftn	2012-08-10 05:23:25.130400000 -0700
-+++ asyncpe-bin/crayftn	2012-08-10 05:35:56.343944159 -0700
-@@ -1434,6 +1434,28 @@ else
-      pnetcdf_fmodules_dir=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$XTPE_LINK_TYPE" != "dynamic" ] ; then
-+      LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+      DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+      DARSHAN_POST_LINK_OPTS="-lfmpich ${DARSHAN_POST_LINK_OPTS}"
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -1664,6 +1686,11 @@ if [ -f ${BUILD_OPTS} ] ; then
-       	eval $($BUILD_OPTS)
- fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- _RUN_OPTIONS="${_FTN_OPTS} $compile_opts $PRE_COMPILE_OPTS $PRE_LINK_OPTS "$@" $END_USER_ARG \
-            $INCLUDE_OPTS ${INC_PATH} $SYSROOT_INC_PATH ${INCDIRS} \
- 	   $POST_COMPILE_OPTS $POST_LINK_OPTS -L${CRAYLIBS} ${rpath_prefix}${CRAYLIBS} ${LIB_PATH} \
-diff -Naupr asyncpe-bin-orig/linux-cc asyncpe-bin/linux-cc
---- asyncpe-bin-orig/linux-cc	2012-08-10 05:23:20.575150000 -0700
-+++ asyncpe-bin/linux-cc	2012-08-10 05:36:33.540531285 -0700
-@@ -1701,6 +1701,35 @@ else
-      LIBPNETCDF=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$XTPE_LINK_TYPE" != "dynamic" ] ; then
-+
-+      case $PE_ENV in     
-+      PGI|GNU|PATHSCALE|INTEL )
-+         LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+         DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+      ;;
-+      *)
-+         # Darshan has not been tested with other compiler combinations
-+      ;;
-+      esac
-+
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
- ##
- # PMI
- ##
-@@ -1979,6 +2008,11 @@ fi
-         eval $($BUILD_OPTS)
-    fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- comp_only=0
- 
- for arg
-diff -Naupr asyncpe-bin-orig/linux-CC asyncpe-bin/linux-CC
---- asyncpe-bin-orig/linux-CC	2012-08-10 05:23:20.579725000 -0700
-+++ asyncpe-bin/linux-CC	2012-08-10 05:36:41.296047857 -0700
-@@ -1948,6 +1948,37 @@ else
-      LIBPNETCDF=
- fi 
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$XTPE_LINK_TYPE" != "dynamic" ] ; then
-+
-+      case $PE_ENV in     
-+      PGI|GNU|PATHSCALE|INTEL )
-+         LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+         DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+         DARSHAN_POST_LINK_OPTS="-lmpichcxx ${DARSHAN_POST_LINK_OPTS}"
-+      ;;
-+      *)
-+         # Darshan has not been tested with other compiler combinations
-+      ;;
-+      esac
-+
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -2218,6 +2249,11 @@ fi
-         eval $($BUILD_OPTS)
-    fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- comp_only=0
- 
- for arg
-diff -Naupr asyncpe-bin-orig/linux-f90 asyncpe-bin/linux-f90
---- asyncpe-bin-orig/linux-f90	2012-08-10 05:23:20.580895000 -0700
-+++ asyncpe-bin/linux-f90	2012-08-10 05:36:53.469547409 -0700
-@@ -1779,6 +1779,37 @@ else
-      LIBPNETCDF=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$XTPE_LINK_TYPE" != "dynamic" ] ; then
-+
-+      case $PE_ENV in     
-+      PGI|GNU|PATHSCALE|INTEL )
-+         LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+         DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+         DARSHAN_POST_LINK_OPTS="-lfmpich ${DARSHAN_POST_LINK_OPTS}"
-+      ;;
-+      *)
-+         # Darshan has not been tested with other compiler combinations
-+      ;;
-+      esac
-+
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -2088,6 +2119,11 @@ fi
-         eval $($BUILD_OPTS)
-    fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- comp_only=0
- for arg
- do

darshan-runtime/share/cray/cray-xt-asyncpe-5.12-darshan.patch

-diff -Naupr asyncpe-bin-orig/crayc++ asyncpe-bin/crayc++
---- asyncpe-bin-orig/crayc++	2013-02-27 09:36:45.969418574 -0600
-+++ asyncpe-bin/crayc++	2013-02-27 09:37:58.521909847 -0600
-@@ -1661,6 +1661,28 @@ else
-      LIBPNETCDF=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$CRAYPE_LINK_TYPE" != "dynamic" ] ; then
-+      LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+      DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+      DARSHAN_POST_LINK_OPTS="-lmpichcxx ${DARSHAN_POST_LINK_OPTS}"
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -1893,6 +1915,12 @@ if [ -f ${BUILD_OPTS} ] ; then
- 	eval $($BUILD_OPTS)
- fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
-+
- _RUN_OPTIONS="$compile_opts $PRE_COMPILE_OPTS $PRE_LINK_OPTS \
-      "$@" -hlast_user_arg \
-      -nostdinc \
-diff -Naupr asyncpe-bin-orig/craycc asyncpe-bin/craycc
---- asyncpe-bin-orig/craycc	2013-02-27 09:36:45.938614537 -0600
-+++ asyncpe-bin/craycc	2013-02-27 09:38:02.068807618 -0600
-@@ -1546,6 +1546,27 @@ else
-      LIBPNETCDF=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$CRAYPE_LINK_TYPE" != "dynamic" ] ; then
-+      LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+      DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -1786,6 +1807,11 @@ if [ -f ${BUILD_OPTS} ] ; then
- 	eval $($BUILD_OPTS)
- fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- _RUN_OPTIONS="$compile_opts $PRE_COMPILE_OPTS $PRE_LINK_OPTS "$@" -hlast_user_arg \
-      -nostdinc \
-      $INCLUDE_OPTS ${COMPILER_INCLUDE} ${INC_PATH} ${GCC_XX_INCLUDE_PATH_LIST} ${GCC_BASE} $SYSROOT $SYSROOT_INC_PATH \
-diff -Naupr asyncpe-bin-orig/crayftn asyncpe-bin/crayftn
---- asyncpe-bin-orig/crayftn	2013-02-27 09:36:45.823973010 -0600
-+++ asyncpe-bin/crayftn	2013-02-27 09:38:05.896830086 -0600
-@@ -1552,6 +1552,28 @@ else
-      pnetcdf_fmodules_dir=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$CRAYPE_LINK_TYPE" != "dynamic" ] ; then
-+      LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+      DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+      DARSHAN_POST_LINK_OPTS="-lfmpich ${DARSHAN_POST_LINK_OPTS}"
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -1805,6 +1827,11 @@ if [ -f ${BUILD_OPTS} ] ; then
-       	eval $($BUILD_OPTS)
- fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- _RUN_OPTIONS="${_FTN_OPTS} $compile_opts $PRE_COMPILE_OPTS $PRE_LINK_OPTS "$@" $END_USER_ARG \
-            $INCLUDE_OPTS ${INC_PATH} $SYSROOT_INC_PATH ${INCDIRS} \
- 	   $POST_COMPILE_OPTS $POST_LINK_OPTS -L${CRAYLIBS} ${CRAYLIBS_RPATH} ${LIB_PATH} \
-diff -Naupr asyncpe-bin-orig/linux-cc asyncpe-bin/linux-cc
---- asyncpe-bin-orig/linux-cc	2013-02-27 09:36:45.998202260 -0600
-+++ asyncpe-bin/linux-cc	2013-02-27 09:38:15.891507131 -0600
-@@ -1851,6 +1851,35 @@ else
-      LIBPNETCDF=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$CRAYPE_LINK_TYPE" != "dynamic" ] ; then
-+
-+      case $PE_ENV in     
-+      PGI|GNU|PATHSCALE|INTEL )
-+         LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+         DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+      ;;
-+      *)
-+         # Darshan has not been tested with other compiler combinations
-+      ;;
-+      esac
-+
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
- ##
- # PMI
- ##
-@@ -2144,6 +2173,11 @@ fi
-         eval $($BUILD_OPTS)
-    fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- comp_only=0
- 
- for arg
-diff -Naupr asyncpe-bin-orig/linux-CC asyncpe-bin/linux-CC
---- asyncpe-bin-orig/linux-CC	2013-02-27 09:36:45.851506594 -0600
-+++ asyncpe-bin/linux-CC	2013-02-27 09:38:18.574255692 -0600
-@@ -2100,6 +2100,37 @@ else
-      LIBPNETCDF=
- fi 
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$CRAYPE_LINK_TYPE" != "dynamic" ] ; then
-+
-+      case $PE_ENV in     
-+      PGI|GNU|PATHSCALE|INTEL )
-+         LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+         DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+         DARSHAN_POST_LINK_OPTS="-lmpichcxx ${DARSHAN_POST_LINK_OPTS}"
-+      ;;
-+      *)
-+         # Darshan has not been tested with other compiler combinations
-+      ;;
-+      esac
-+
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -2383,6 +2414,11 @@ fi
-         eval $($BUILD_OPTS)
-    fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- comp_only=0
- 
- for arg
-diff -Naupr asyncpe-bin-orig/linux-f90 asyncpe-bin/linux-f90
---- asyncpe-bin-orig/linux-f90	2013-02-27 09:36:45.899788203 -0600
-+++ asyncpe-bin/linux-f90	2013-02-27 09:38:26.239283575 -0600
-@@ -1918,6 +1918,37 @@ else
-      LIBPNETCDF=
- fi
- 
-+###
-+# Process Darshan libraries
-+###
-+
-+if [ ${CRAY_DARSHAN_DIR:+1} ] ; then
-+
-+   unset LIBDARSHAN
-+   unset DARSHAN_POST_LINK_OPTS
-+
-+   # disable darshan if dynamic linking
-+   if [ "$CRAYPE_LINK_TYPE" != "dynamic" ] ; then
-+
-+      case $PE_ENV in     
-+      PGI|GNU|PATHSCALE|INTEL )
-+         LIBDARSHAN=`${CRAY_DARSHAN_DIR}/bin/darshan-config --post-ld-flags`
-+         DARSHAN_POST_LINK_OPTS=`${CRAY_DARSHAN_DIR}/bin/darshan-config --pre-ld-flags`
-+         DARSHAN_POST_LINK_OPTS="-lfmpich ${DARSHAN_POST_LINK_OPTS}"
-+      ;;
-+      *)
-+         # Darshan has not been tested with other compiler combinations
-+      ;;
-+      esac
-+
-+   fi
-+
-+else
-+   LIBDARSHAN=
-+   DARSHAN_POST_LINK_OPTS=
-+fi
-+
-+
- ##
- # PMI
- ##
-@@ -2239,6 +2270,11 @@ fi
-         eval $($BUILD_OPTS)
-    fi
- 
-+if [ ${DARSHAN_POST_LINK_OPTS:+1} ] ; then
-+   CNL_LIBS_LIST="$CNL_LIBS_LIST $LIBDARSHAN"
-+   POST_COMPILE_OPTS="${DARSHAN_POST_LINK_OPTS} ${POST_COMPILE_OPTS}" 
-+fi
-+
- comp_only=0
- for arg
- do

darshan-runtime/share/cray/darshan-module.in

@@ -35,15 +35,43 @@ module-whatis			"$description"
 
 ## Software-specific settings exported to user environment
 
-# Note: The following environment variables are picked up by the system
-#       compiler scripts to enable darshan at link time for statically linked
-#       executables 
-
 setenv CRAY_DARSHAN_VERSION              $version
 setenv CRAY_DARSHAN_DIR                  $root
 
-# Put darshan utilities in the path
+# Put darshan utilities and libraries in system paths
 prepend-path PATH $root/bin
+prepend-path CRAY_LD_LIBRARY_PATH           $root/lib
+
+# initial link options for Darshan
+setenv DARSHAN_POST_LINK_OPTS " -L$root/lib -ldarshan-mpi-io -lz -Wl,-u,__wrap_fopen,-u,MPI_Init,-u,MPI_Wtime,-wrap,write,-wrap,open,-wrap,creat,-wrap,creat64,-wrap,open64,-wrap,close,-wrap,read,-wrap,lseek,-wrap,lseek64,-wrap,pread,-wrap,pwrite,-wrap,readv,-wrap,writev,-wrap,__xstat,-wrap,__lxstat,-wrap,__fxstat,-wrap,__xstat64,-wrap,__lxstat64,-wrap,__fxstat64,-wrap,mmap,-wrap,mmap64,-wrap,fopen,-wrap,fclose,-wrap,fread,-wrap,fwrite,-wrap,fseek,-wrap,fopen64,-wrap,pread64,-wrap,pwrite64,-wrap,fsync,-wrap,fdatasync,-wrap,ncmpi_create,-wrap,ncmpi_open,-wrap,ncmpi_close,-wrap,H5Fcreate,-wrap,H5Fopen,-wrap,H5Fclose  -lfmpich -lmpichcxx -ldarshan-posix -ldarshan-mpi-io -lz "
+
+# Add Darshan to the PE_PRODUCT_LIST variable.  This will cause the
+# compiler scripts to insert DARSHAN_POST_LINK_OPTS into the link command
+# line.
+prepend-path PE_PRODUCT_LIST $product
+
+# IMPORTANT: In addition to the DARSHAN_POST_LINK_OPTS option shown above,
+# we must also add -ldarshan-mpi-io to the CNL_LIBS_LIST variable in
+# the compiler scripts. This enables the linker to make a final pass to
+# resolve darshan symbols if an application library is indirectly using a
+# high level library like hdf5 or pnetcdf.
+#
+# You can either modify the linux-cc, linux-f90, linux-CC, craycc, crayftn,
+# and crayc++ scripts to include a new variable (for example, LIBDARSHAN) in
+# CNL_LIBS_LIST, or for testing purposes you can re-use an existing variable
+# from another software product.  Three possible examples are shown below
+# but commented out:
+#
+# this one requires modification to the cray compiler scripts:
+#setenv LIBDARSHAN "-ldarshan-mpi-io"
+# 
+# this one adds on to a variable normally used by trilinos:
+#setenv LIBTRILINOS "$LIBTRILINOS -ldarshan-mpi-io"
+#
+# this one adds on to a variable normally used by trilinos: