Skip to content

Commit 8bf3a86

Browse files
benmenaduejsquyres
authored andcommitted
Hold off running hwloc:external feature tests until after we decide if we're using the internal or external component. This fixes #6430.
Signed-off-by: Ben Menadue <[email protected]> (cherry picked from commit 17dcc70)
1 parent 056d7ad commit 8bf3a86

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

opal/mca/hwloc/external/configure.m4

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
133133
[CPPFLAGS="$CPPFLAGS $opal_hwloc_external_CPPFLAGS"
134134
LDFLAGS="$LDFLAGS $opal_hwloc_external_LDFLAGS"
135135
LIBS="$LIBS $opal_hwloc_external_LIBS"
136-
AC_CHECK_DECLS([HWLOC_OBJ_OSDEV_COPROC], [], [], [#include <hwloc.h>])
137-
AC_CHECK_FUNCS([hwloc_topology_dup])
138136

139137
AC_MSG_CHECKING([if external hwloc version is 1.5 or greater])
140138
AC_COMPILE_IFELSE(
@@ -172,6 +170,9 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
172170
[external],
173171
[Version of hwloc])
174172

173+
AC_CHECK_DECLS([HWLOC_OBJ_OSDEV_COPROC], [], [], [#include <hwloc.h>])
174+
AC_CHECK_FUNCS([hwloc_topology_dup])
175+
175176
# See if the external hwloc supports XML
176177
AC_MSG_CHECKING([if external hwloc supports XML])
177178
AS_IF([test "$opal_hwloc_dir" != ""],

0 commit comments

Comments
 (0)