Skip to content

Commit bab5d2d

Browse files
committed
Clear wrapper CPPFLAGS before populating
The wrapper compiler infrastructure enforces using OPAL_WRAPPER_FLAGS_ADD rather than modifying environment variables directly, in part by overwriting the values of {OPAL,OMPI}_WRAPPER_EXTRA_<flag> before using. The WRAPPER_EXTRA_CPPFLAGS variable was not properly cleared in the case where install headers were not installed, so properly initialize them. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent f4796a8 commit bab5d2d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

config/opal_setup_wrappers.m4

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,8 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
343343
AC_MSG_CHECKING([for OPAL CPPFLAGS])
344344
if test "$WANT_INSTALL_HEADERS" = "1" ; then
345345
OPAL_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi'
346+
else
347+
OPAL_WRAPPER_EXTRA_CPPFLAGS=
346348
fi
347349
OPAL_WRAPPER_EXTRA_CPPFLAGS="$OPAL_WRAPPER_EXTRA_CPPFLAGS $opal_mca_wrapper_extra_cppflags $wrapper_extra_cppflags $with_wrapper_cppflags"
348350
AC_SUBST([OPAL_WRAPPER_EXTRA_CPPFLAGS])
@@ -394,6 +396,8 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
394396
AC_MSG_CHECKING([for OMPI CPPFLAGS])
395397
if test "$WANT_INSTALL_HEADERS" = "1" ; then
396398
OMPI_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi'
399+
else
400+
OPAL_WRAPPER_EXTRA_CPPFLAGS=
397401
fi
398402
OMPI_WRAPPER_EXTRA_CPPFLAGS="$OMPI_WRAPPER_EXTRA_CPPFLAGS $ompi_mca_wrapper_extra_cppflags $wrapper_extra_cppflags $with_wrapper_cppflags"
399403
AC_SUBST([OMPI_WRAPPER_EXTRA_CPPFLAGS])

0 commit comments

Comments
 (0)