Skip to content

configure: don't pass compile flags through WRAPPER #7921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hzhou wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −32
Open

configure: don't pass compile flags through WRAPPER #7921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d06b07a
configure: don't pass compile flags through WRAPPER
hzhou Aug 4, 2026
bd13e86
mpichinfo: more accurate MPICH COMPILER info
hzhou Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions confdb/aclocal_coverage.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,13 @@ 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
if test "$enable_cxx" = "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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions confdb/aclocal_util.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
])
Expand Down
19 changes: 5 additions & 14 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,40 +1328,31 @@ 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
PAC_APPEND_FLAG([-O1 -g -fsanitize=address -fno-omit-frame-pointer],[CFLAGS])
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])
Expand Down
8 changes: 4 additions & 4 deletions src/include/mpichinfo.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@"

Expand Down