Skip to content

Commit ca72bd4

Browse files
committed
build: clean up opal_mca / dlopen argument handling
opal_mca.m4 was setting enable_dlopen after it was processed, and the dlopen argument checking was overriding configure arguments that belong to opal_mca. Clean up the late change in enable_dlopen and handle the --disable-dlopen case in opal_mca instead of overriding user options. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent 1da3f93 commit ca72bd4

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

config/opal_configure_options.m4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,6 @@ AC_ARG_ENABLE([dlopen],
275275
Disabling dlopen implies --disable-mca-dso.
276276
(default: enabled)])])
277277
if test "$enable_dlopen" = "no" ; then
278-
enable_mca_dso=no
279-
enable_mca_static=yes
280278
OPAL_ENABLE_DLOPEN_SUPPORT=0
281279
AC_MSG_RESULT([no])
282280
else

config/opal_mca.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ AC_DEFUN([OPAL_MCA],[
166166
# resolution (prefer static) is done in the big loop below
167167
#
168168
AC_MSG_CHECKING([which components should be run-time loadable])
169-
if test "$enable_static" != "no"; then
169+
if test "$enable_static" != "no" || test "$OPAL_ENABLE_DLOPEN_SUPPORT" = 0; then
170170
DSO_all=0
171171
msg=none
172172
elif test -z "$enable_mca_dso" || test "$enable_mca_dso" = "yes"; then
@@ -175,7 +175,6 @@ AC_DEFUN([OPAL_MCA],[
175175
elif test "$enable_mca_dso" = "no"; then
176176
DSO_all=0
177177
msg=none
178-
enable_dlopen=no
179178
else
180179
DSO_all=0
181180
ifs_save="$IFS"

0 commit comments

Comments
 (0)