1
1

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 <ben.menadue@nci.org.au>
(cherry picked from commit 17dcc7041a)
Этот коммит содержится в:
Ben Menadue 2019-02-25 16:58:11 +11:00 коммит произвёл Jeff Squyres
родитель 056d7ad0a3
Коммит 8bf3a86cb0

5
opal/mca/hwloc/external/configure.m4 поставляемый
Просмотреть файл

@ -133,8 +133,6 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
[CPPFLAGS="$CPPFLAGS $opal_hwloc_external_CPPFLAGS"
LDFLAGS="$LDFLAGS $opal_hwloc_external_LDFLAGS"
LIBS="$LIBS $opal_hwloc_external_LIBS"
AC_CHECK_DECLS([HWLOC_OBJ_OSDEV_COPROC], [], [], [#include <hwloc.h>])
AC_CHECK_FUNCS([hwloc_topology_dup])
AC_MSG_CHECKING([if external hwloc version is 1.5 or greater])
AC_COMPILE_IFELSE(
@ -172,6 +170,9 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
[external],
[Version of hwloc])
AC_CHECK_DECLS([HWLOC_OBJ_OSDEV_COPROC], [], [], [#include <hwloc.h>])
AC_CHECK_FUNCS([hwloc_topology_dup])
# See if the external hwloc supports XML
AC_MSG_CHECKING([if external hwloc supports XML])
AS_IF([test "$opal_hwloc_dir" != ""],