Skip to content

Commit e42a68e

Browse files
bwbarrettawlauria
authored andcommitted
Fix libs handling in opal wrapper libs
Unify behavior between the opal wrapper libs and the ompi wrapper libs by 1) not copying what is already in OPAL_WRAPPER_EXTRA_LIBS (which should be a null string if everyone behaved) and 2) adding LIBS to the wrapper libs. Signed-off-by: Brian Barrett <bbarrett@amazon.com> (cherry picked from commit 032e871)
1 parent da019dd commit e42a68e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

config/opal_setup_wrappers.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,10 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
382382
# and this cleans the duplication up a bunch. Always add everything the user
383383
# asked for, as they know better than us.
384384
AC_MSG_CHECKING([for OPAL LIBS])
385-
OPAL_WRAPPER_EXTRA_LIBS="$opal_mca_wrapper_extra_libs $OPAL_WRAPPER_EXTRA_LIBS"
385+
OPAL_WRAPPER_EXTRA_LIBS="$opal_mca_wrapper_extra_libs"
386386
OPAL_FLAGS_APPEND_UNIQ([OPAL_WRAPPER_EXTRA_LIBS], [$wrapper_extra_libs])
387387
OPAL_WRAPPER_EXTRA_LIBS="$OPAL_WRAPPER_EXTRA_LIBS $with_wrapper_libs"
388+
OPAL_FLAGS_APPEND_UNIQ([OMPI_WRAPPER_EXTRA_LIBS], [$LIBS])
388389
AC_SUBST([OPAL_WRAPPER_EXTRA_LIBS])
389390
AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_LIBS])
390391
])

0 commit comments

Comments
 (0)