From f64f0da97589415f7946bdeceab7e6876a51c104 Mon Sep 17 00:00:00 2001 From: harms Date: Thu, 11 Apr 2013 20:52:18 +0000 Subject: [PATCH] Add support for CC and MPICH_CC in compiler wrappers git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@693 3b7491f3-a168-0410-bf4b-c445ed680a29 --- darshan-runtime/darshan-gen-cc.pl.in | 6 +++++- darshan-runtime/darshan-gen-cxx.pl.in | 6 +++++- darshan-runtime/darshan-gen-fortran.pl.in | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/darshan-runtime/darshan-gen-cc.pl.in b/darshan-runtime/darshan-gen-cc.pl.in index 89ad61e..abe8f99 100644 --- a/darshan-runtime/darshan-gen-cc.pl.in +++ b/darshan-runtime/darshan-gen-cc.pl.in @@ -117,7 +117,11 @@ print OUTPUT<<"EOF"; # Show is set to echo to cause the compilation command to be echoed instead # of executed. Show= -CC="$CC" +CC=${CC:-"$CC"} +if [ -n "$MPICH_CC" ] ; then + CC="$MPICH_CC" +fi + EOF if ($xl_check == 1) diff --git a/darshan-runtime/darshan-gen-cxx.pl.in b/darshan-runtime/darshan-gen-cxx.pl.in index 6dcedfa..72267b8 100644 --- a/darshan-runtime/darshan-gen-cxx.pl.in +++ b/darshan-runtime/darshan-gen-cxx.pl.in @@ -117,7 +117,11 @@ print OUTPUT<<"EOF"; # Show is set to echo to cause the compilation command to be echoed instead # of executed. Show= -CXX="$CXX" +CXX=${CXX:-"$CXX"} +if [ -n "$MPICH_CC" ] ; then + CXX="$MPICH_CXX" +fi + EOF if ($xl_check == 1) diff --git a/darshan-runtime/darshan-gen-fortran.pl.in b/darshan-runtime/darshan-gen-fortran.pl.in index fce8d8b..6f9fb48 100644 --- a/darshan-runtime/darshan-gen-fortran.pl.in +++ b/darshan-runtime/darshan-gen-fortran.pl.in @@ -117,7 +117,11 @@ print OUTPUT<<"EOF"; # Show is set to echo to cause the compilation command to be echoed instead # of executed. Show= -FC="$FC" +FC=${F77:-"$FC"} +if [ -n "$MPICH_F77" ] ; then + FC="$MPICH_F77" +fi + EOF if ($xl_check == 1) -- 2.26.2