We always want to add HWLOC_EMBEDDED_LIBS to the wrapper flags. It'll
either be empty or have meaningful stuff in it. This commit was SVN r25761.
Этот коммит содержится в:
родитель
6cad1f34e0
Коммит
6c6d19f5f5
@ -12,7 +12,6 @@
|
|||||||
#
|
#
|
||||||
# Priority
|
# Priority
|
||||||
#
|
#
|
||||||
# JMS Temporarily make this higher than hwlo121
|
|
||||||
AC_DEFUN([MCA_opal_hwloc_hwloc131_PRIORITY], [65])
|
AC_DEFUN([MCA_opal_hwloc_hwloc131_PRIORITY], [65])
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -118,9 +117,10 @@ AC_DEFUN([MCA_opal_hwloc_hwloc131_CONFIG],[
|
|||||||
[opal_hwloc_hwloc131_ADD_CPPFLAGS="$opal_hwloc_hwloc131_ADD_CPPFLAGS -I$OMPI_TOP_BUILDDIR/$opal_hwloc_hwloc131_file/include"])
|
[opal_hwloc_hwloc131_ADD_CPPFLAGS="$opal_hwloc_hwloc131_ADD_CPPFLAGS -I$OMPI_TOP_BUILDDIR/$opal_hwloc_hwloc131_file/include"])
|
||||||
if test "$with_devel_headers" = "yes" ; then
|
if test "$with_devel_headers" = "yes" ; then
|
||||||
opal_hwloc_hwloc131_ADD_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/'"$opal_hwloc_hwloc131_basedir/hwloc/include"
|
opal_hwloc_hwloc131_ADD_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/'"$opal_hwloc_hwloc131_basedir/hwloc/include"
|
||||||
opal_hwloc_hwloc131_ADD_WRAPPER_EXTRA_LIBS=$HWLOC_EMBEDDED_LIBS
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
opal_hwloc_hwloc131_ADD_WRAPPER_EXTRA_LIBS=$HWLOC_EMBEDDED_LIBS
|
||||||
|
|
||||||
$1],
|
$1],
|
||||||
[$2])
|
[$2])
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user