1
1

As per the thread on ticket #4399, OSHMEM does not support non-Linux platforms. So provide a check for Linux and error out if --enable-oshmem is given on a non-supported platform. If no OSHMEM option is given (enable or disable), then don't attempt to build OSHMEM unless we are on a Linux platform. Default to building if we are on Linux for now, pending the outcome of the Debian situation.

cmr=v1.7.5:reviewer=jsquyres:subject=disable OSHMEM on non-Linux platforms

This commit was SVN r31155.
Этот коммит содержится в:
Ralph Castain 2014-03-19 20:32:15 +00:00
родитель d17f811ff5
Коммит 17d618abd2
2 изменённых файлов: 23 добавлений и 2 удалений

Просмотреть файл

@ -19,11 +19,31 @@ AC_SUBST(OSHMEM_LIBSHMEM_EXTRA_LDFLAGS)
#
# Disable Open SHMEM?
#
AC_MSG_CHECKING([if want oshmem])
AC_ARG_ENABLE([oshmem],
[AC_HELP_STRING([--enable-oshmem],
[Enable building the OpenSHMEM interface (disabled by default)])],
[],
[enable_oshmem=no])
[oshmem_arg_given=yes],
[oshmem_arg_given=no])
if test "$oshmem_arg_given" == "yes"; then
if test "$enable_oshmem" == "yes"; then
AC_MSG_RESULT([yes])
if test "$opal_found_linux" != "yes"; then
AC_MSG_WARN([OpenSHMEM support was requested, but currently])
AC_MSG_WARN([only supports Linux.])
AC_MSG_ERROR([Cannot continue])
fi
fi
AC_MSG_RESULT([no])
else
if test "$opal_found_linux" == "yes"; then
enable_oshmem=yes
AC_MSG_RESULT([yes])
else
enable_oshmem=no
AC_MSG_RESULT([not supported on this platform])
fi
fi
#
# Enable compatibility mode

Просмотреть файл

@ -250,6 +250,7 @@ AC_SUBST(top_ompi_builddir)
############################################################################
OPAL_CONFIGURE_OPTIONS
OPAL_CHECK_OS_FLAVORS
OPAL_CHECK_CUDA
m4_ifdef([project_orte], [ORTE_CONFIGURE_OPTIONS])
m4_ifdef([project_ompi], [OMPI_CONFIGURE_OPTIONS])