This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via ed612b0a744661e974b0e56c3d121a99627543da (commit) from 701056db57aea45096d4468291abe36df45d5f87 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/ed612b0a744661e974b0e56c3d121a9962... commit ed612b0a744661e974b0e56c3d121a99627543da Author: Wesley Bland <[email protected]> Date: Thu Oct 6 09:09:54 2016 -0500 CH4/OFI: Avoid messing up compile/link flags The link flags for libfabric were getting messed up if the user passed in embedded as the value because they were being added to LDFLAGS too early. Avoid this by only doing it when we determine that we are not embedding. Also avoid nuking too much of the user inputed flags so we can keep things like visibility preserved. diff --git a/src/mpid/ch4/netmod/ofi/subconfigure.m4 b/src/mpid/ch4/netmod/ofi/subconfigure.m4 index 9579175..dc3522a 100644 --- a/src/mpid/ch4/netmod/ofi/subconfigure.m4 +++ b/src/mpid/ch4/netmod/ofi/subconfigure.m4 @@ -118,8 +118,6 @@ AM_COND_IF([BUILD_CH4_NETMOD_OFI],[ ofilib="" AC_SUBST([ofilib]) - PAC_SET_HEADER_LIB_PATH(libfabric) - ofi_embedded="" dnl Use embedded libfabric if we specify to do so or we didn't specify and the source is present if test "${with_libfabric}" = "embedded" ; then @@ -129,9 +127,11 @@ AM_COND_IF([BUILD_CH4_NETMOD_OFI],[ ofi_embedded="yes" else ofi_embedded="no" + PAC_SET_HEADER_LIB_PATH(libfabric) fi else ofi_embedded="no" + PAC_SET_HEADER_LIB_PATH(libfabric) fi if test "${ofi_embedded}" = "yes" ; then @@ -140,13 +140,7 @@ AM_COND_IF([BUILD_CH4_NETMOD_OFI],[ dnl Unset all of these env vars so they don't pollute the libfabric configuration PAC_PUSH_ALL_FLAGS() - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset FFLAGS - unset FCFLAGS - unset LDFLAGS - unset LIBS + PAC_RESET_ALL_FLAGS() PAC_CONFIG_SUBDIR_ARGS([src/mpid/ch4/netmod/ofi/libfabric],[$ofi_subdir_args],[],[AC_MSG_ERROR(libfabric configure failed)]) PAC_POP_ALL_FLAGS() PAC_APPEND_FLAG([-I${master_top_builddir}/src/mpid/ch4/netmod/ofi/libfabric/include], [CPPFLAGS]) ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/netmod/ofi/subconfigure.m4 | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository