Skip to content

Commit 3b60b5c

Browse files
authored
Merge pull request #9771 from bwbarrett/bugfix/pmix-wrapper-libs
Fix broken internal pmix configure
2 parents 295ef25 + 11be28a commit 3b60b5c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

config/opal_config_pmix.m4

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,10 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
164164
[opal_pmix_WRAPPER_LDFLAGS="$pkg_config_ldflags"
165165
opal_pmix_WRAPPER_LIBS="$pkg_config_libs"],
166166
[# guess that what we have from compiling OMPI is good enough
167-
opal_pmix_WRAPPER_LDFLAGS="$opal_hwloc_LDFLAGS"
168-
opal_pmix_WRAPPER_LIBS="$opal_hwloc_LIBS"])
167+
AS_IF([test -z "$opal_pmix_WRAPPER_LDFLAGS"],
168+
[opal_pmix_WRAPPER_LDFLAGS="$opal_pmix_LDFLAGS"])
169+
AS_IF([test -z "$opal_pmix_WRAPPER_LIBS"],
170+
[opal_pmix_WRAPPER_LIBS="$opal_pmix_LIBS"])])
169171
170172
OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$opal_pmix_WRAPPER_LDFLAGS])
171173
OPAL_WRAPPER_FLAGS_ADD([LIBS], [$opal_pmix_WRAPPER_LIBS])
@@ -251,6 +253,7 @@ AC_DEFUN([_OPAL_CONFIG_PMIX_INTERNAL_POST], [
251253
opal_pmix_CPPFLAGS="-I$OMPI_TOP_BUILDDIR/3rd-party/openpmix/include -I$OMPI_TOP_SRCDIR/3rd-party/openpmix/include"
252254
opal_pmix_LDFLAGS=""
253255
opal_pmix_LIBS="$OMPI_TOP_BUILDDIR/3rd-party/openpmix/src/libpmix.la"
256+
opal_pmix_WRAPPER_LIBS="-lpmix $opal_hwloc_WRAPPER_LIBS $opal_libevent_WRAPPER_LIBS"
254257
255258
CPPFLAGS="$CPPFLAGS $opal_pmix_CPPFLAGS"
256259

config/opal_setup_wrappers.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ AC_DEFUN([OPAL_WRAPPER_FLAGS_ADD], [
4545
[$1], [LDFLAGS], [OPAL_FLAGS_APPEND_UNIQ([wrapper_extra_ldflags], [$2])],
4646
[$1], [LIBS], [OPAL_FLAGS_APPEND_MOVE([wrapper_extra_libs], [$2])],
4747
[m4_fatal([Unknown wrapper flag type $1])])
48+
opal_show_verbose "Adding \"$2\" to \"$1\""
4849
])
4950

5051

0 commit comments

Comments
 (0)