diff --git a/confdb/aclocal_coverage.m4 b/confdb/aclocal_coverage.m4
index be551abf24b..0feee57ddba 100644
--- a/confdb/aclocal_coverage.m4
+++ b/confdb/aclocal_coverage.m4
@@ -26,9 +26,6 @@ if test "$enable_coverage" = "yes" ; then
     if test "$ac_cv_c_compiler_gnu" = "yes" ; then
         CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
         LIBS="$LIBS -lgcov"
-        if test ${WRAPPER_CFLAGS+set} = set ; then
-            WRAPPER_CFLAGS="$WRAPPER_CFLAGS -fprofile-arcs -ftest-coverage"
-        fi
     else
         AC_MSG_WARN([--enable-coverage only supported for GCC])
     fi
@@ -36,9 +33,6 @@ if test "$enable_coverage" = "yes" ; then
         if test "$ac_cv_cxx_compiler_gnu" = "yes" ; then
             CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
             LIBS="$LIBS -lgcov"
-            if test ${WRAPPER_CXXFLAGS+set} = set ; then
-                WRAPPER_CXXFLAGS="$WRAPPER_CXXFLAGS -fprofile-arcs -ftest-coverage"
-            fi
         else
             AC_MSG_WARN([--enable-coverage only supported for GCC])
         fi
@@ -49,9 +43,6 @@ if test "$enable_coverage" = "yes" ; then
         if test "$ac_cv_f77_compiler_gnu" = "yes" ; then
              FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage"
              LIBS="$LIBS -lgcov"
-             if test ${WRAPPER_FFLAGS+set} = set ; then
-                 WRAPPER_FFLAGS="$WRAPPER_FFLAGS -fprofile-arcs -ftest-coverage"
-             fi
         else
             AC_MSG_WARN([--enable-coverage only supported for G77/GFORTRAN])
         fi
@@ -60,9 +51,6 @@ if test "$enable_coverage" = "yes" ; then
         if test "$ac_cv_fc_compiler_gnu" = "yes" ; then
              FCFLAGS="$FCFLAGS -fprofile-arcs -ftest-coverage"
              LIBS="$LIBS -lgcov"
-             if test ${WRAPPER_FCFLAGS+set} = set ; then
-                 WRAPPER_FCFLAGS="$WRAPPER_FCFLAGS -fprofile-arcs -ftest-coverage"
-             fi
         else
             AC_MSG_WARN([--enable-coverage only supported for GFORTRAN])
         fi
diff --git a/confdb/aclocal_util.m4 b/confdb/aclocal_util.m4
index 5cb0fe0b59d..8eaf466bb9f 100644
--- a/confdb/aclocal_util.m4
+++ b/confdb/aclocal_util.m4
@@ -45,10 +45,10 @@ AC_DEFUN([PAC_POP_ALL_FLAGS],[
 	PAC_POP_FLAG(LIBS)
 ])
 
-dnl PAC_PREFIX_FLAG - Save flag with a prefix
+dnl PAC_PREFIX_FLAG - Initialize a prefixed flag variable
 dnl Usage: PAC_PREFIX_FLAG(PREFIX, FLAG)
 AC_DEFUN([PAC_PREFIX_FLAG],[
-	$1_$2=$$2
+	$1_$2=""
 	export $1_$2
 	AC_SUBST($1_$2)
 ])
diff --git a/configure.ac b/configure.ac
index 988cd33c22b..b3fcf8c7459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1328,10 +1328,6 @@ if test "$enable_append_g" = "yes" ; then
     PAC_APPEND_FLAG([-g],[CXXFLAGS])
     PAC_APPEND_FLAG([-g],[FFLAGS])
     PAC_APPEND_FLAG([-g],[FCFLAGS])
-    PAC_APPEND_FLAG([-g],[WRAPPER_CFLAGS])
-    PAC_APPEND_FLAG([-g],[WRAPPER_CXXFLAGS])
-    PAC_APPEND_FLAG([-g],[WRAPPER_FFLAGS])
-    PAC_APPEND_FLAG([-g],[WRAPPER_FCFLAGS])
 fi
 
 if test "$enable_asan" = "yes" ; then
@@ -1339,29 +1335,24 @@ if test "$enable_asan" = "yes" ; then
     PAC_APPEND_FLAG([-O1 -g -fsanitize=address -fno-omit-frame-pointer],[CXXFLAGS])
     PAC_APPEND_FLAG([-O1 -g -fsanitize=address -fno-omit-frame-pointer],[FFLAGS])
     PAC_APPEND_FLAG([-O1 -g -fsanitize=address -fno-omit-frame-pointer],[FCFLAGS])
-    PAC_APPEND_FLAG([-O1 -g -fsanitize=address -fno-omit-frame-pointer],[WRAPPER_CFLAGS])
-    PAC_APPEND_FLAG([-O1 -g -fsanitize=address -fno-omit-frame-pointer],[WRAPPER_CXXFLAGS])
-    PAC_APPEND_FLAG([-O1 -g -fsanitize=address -fno-omit-frame-pointer],[WRAPPER_FFLAGS])
-    PAC_APPEND_FLAG([-O1 -g -fsanitize=address -fno-omit-frame-pointer],[WRAPPER_FCFLAGS])
     PAC_APPEND_FLAG([-fsanitize=address],[LDFLAGS])
+    dnl The sanitizer ldflags need be passed to wrapper or the user program will
+    dnl fail with "ASan runtime does not come first in initial library list"
+    PAC_APPEND_FLAG([-fsanitize=address],[WRAPPER_LDFLAGS])
 fi
 if test "$enable_ubsan" = "yes" ; then
     PAC_APPEND_FLAG([-fsanitize=undefined],[CFLAGS])
     PAC_APPEND_FLAG([-fsanitize=undefined],[CXXFLAGS])
     PAC_APPEND_FLAG([-fsanitize=undefined],[FFLAGS])
     PAC_APPEND_FLAG([-fsanitize=undefined],[FCFLAGS])
-    PAC_APPEND_FLAG([-fsanitize=undefined],[WRAPPER_CFLAGS])
-    PAC_APPEND_FLAG([-fsanitize=undefined],[WRAPPER_CXXFLAGS])
-    PAC_APPEND_FLAG([-fsanitize=undefined],[WRAPPER_FFLAGS])
-    PAC_APPEND_FLAG([-fsanitize=undefined],[WRAPPER_FCFLAGS])
     PAC_APPEND_FLAG([-fsanitize=undefined],[LDFLAGS])
+    PAC_APPEND_FLAG([-fsanitize=undefined],[WRAPPER_LDFLAGS])
 fi
 if test "$enable_tsan" = "yes" ; then
     PAC_APPEND_FLAG([-fsanitize=thread],[CFLAGS])
     PAC_APPEND_FLAG([-fsanitize=thread],[CXXFLAGS])
-    PAC_APPEND_FLAG([-fsanitize=thread],[WRAPPER_CFLAGS])
-    PAC_APPEND_FLAG([-fsanitize=thread],[WRAPPER_CXXFLAGS])
     PAC_APPEND_FLAG([-fsanitize=thread],[LDFLAGS])
+    PAC_APPEND_FLAG([-fsanitize=thread],[WRAPPER_LDFLAGS])
 fi
 if test -n "$perform_meminit" ; then
     AC_DEFINE(MPICH_DEBUG_MEMINIT,1,[Define to enable preinitialization of memory used by structures and unions])
diff --git a/src/include/mpichinfo.h.in b/src/include/mpichinfo.h.in
index 385779f720c..7e50977123b 100644
--- a/src/include/mpichinfo.h.in
+++ b/src/include/mpichinfo.h.in
@@ -15,10 +15,10 @@
 #define MPICH_CONFIGURE_ARGS_CLEAN "@CONFIGURE_ARGS_CLEAN@"
 #define MPICH_VERSION_DATE "@MPICH_RELEASE_DATE@"
 #define MPICH_DEVICE "@DEVICE@"
-#define MPICH_COMPILER_CC "@CC@ @CFLAGS@"
-#define MPICH_COMPILER_CXX "@CXX@ @CXXFLAGS@"
-#define MPICH_COMPILER_F77 "@F77@ @FFLAGS@"
-#define MPICH_COMPILER_FC "@FC@ @FCFLAGS@"
+#define MPICH_COMPILER_CC "@CC@ @MPICH_MPICC_CPPFLAGS@ @MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@"
+#define MPICH_COMPILER_CXX "@CXX@ @MPICH_MPICXX_CPPFLAGS@ @MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@"
+#define MPICH_COMPILER_F77 "@F77@ @MPICH_MPIF77_CPPFLAGS@ @MPICH_MPIF77_FFLAGS@ @WRAPPER_FFLAGS@"
+#define MPICH_COMPILER_FC "@FC@ @MPICH_MPIFORT_CPPFLAGS@ @MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
 #define MPICH_CUSTOM_STRING "@MPICH_CUSTOM_STRING@"
 #define MPICH_ABIVERSION "@ABIVERSION@"