Skip to content

Commit 59bf4ee

Browse files
committed
build: Remove ORTE references from MCA system
Remove a couple of lingering ORTE references in the MCA system. With ORTE gone, there's no need for this special case code. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent 92389c3 commit 59bf4ee

File tree

2 files changed

+2
-55
lines changed

2 files changed

+2
-55
lines changed

config/opal_mca.m4

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,8 @@ AC_DEFUN([OPAL_MCA],[
237237
MCA_PROJECT_SUBDIRS=
238238
MCA_PROJECT_DIST_SUBDIRS=
239239
m4_foreach(mca_project, [mca_project_list],
240-
[# BWB: Until projects have separate configure scripts
241-
# and can skip running all of ORTE, just avoid recursing
242-
# into orte sub directory if orte disabled
243-
if (test "mca_project" = "ompi" && test "$enable_mpi" != "no") || test "mca_project" = "opal" || test "mca_project" = "orte" || test "mca_project" = "oshmem"; then
244-
MCA_PROJECT_SUBDIRS="$MCA_PROJECT_SUBDIRS mca_project"
245-
MCA_PROJECT_DIST_SUBDIRS="$MCA_PROJECT_DIST_SUBDIRS mca_project"
246-
fi
240+
[MCA_PROJECT_SUBDIRS="$MCA_PROJECT_SUBDIRS mca_project"
241+
MCA_PROJECT_DIST_SUBDIRS="$MCA_PROJECT_DIST_SUBDIRS mca_project"
247242
MCA_CONFIGURE_PROJECT(mca_project)])
248243

249244
AC_SUBST(MCA_PROJECT_SUBDIRS)

config/opal_setup_wrappers.m4

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -383,54 +383,6 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
383383
AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_LIBS])
384384
])
385385

386-
m4_ifdef([project_orte], [
387-
AC_MSG_CHECKING([for ORTE CPPFLAGS])
388-
if test "$WANT_INSTALL_HEADERS" = "1" ; then
389-
ORTE_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi'
390-
fi
391-
ORTE_WRAPPER_EXTRA_CPPFLAGS="$ORTE_WRAPPER_EXTRA_CPPFLAGS $orte_mca_wrapper_extra_cppflags $wrapper_extra_cppflags $with_wrapper_cppflags"
392-
AC_SUBST([ORTE_WRAPPER_EXTRA_CPPFLAGS])
393-
AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_CPPFLAGS])
394-
395-
AC_MSG_CHECKING([for ORTE CFLAGS])
396-
ORTE_WRAPPER_EXTRA_CFLAGS="$wrapper_extra_cflags $with_wrapper_cflags"
397-
AC_SUBST([ORTE_WRAPPER_EXTRA_CFLAGS])
398-
AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_CFLAGS])
399-
400-
AC_MSG_CHECKING([for ORTE CFLAGS_PREFIX])
401-
ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX="$with_wrapper_cflags_prefix"
402-
AC_SUBST([ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX])
403-
AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX])
404-
405-
AC_MSG_CHECKING([for ORTE LDFLAGS])
406-
ORTE_WRAPPER_EXTRA_LDFLAGS="$orte_mca_wrapper_extra_ldflags $wrapper_extra_ldflags $with_wrapper_ldflags"
407-
RPATHIFY_LDFLAGS([ORTE_WRAPPER_EXTRA_LDFLAGS])
408-
AC_SUBST([ORTE_WRAPPER_EXTRA_LDFLAGS])
409-
AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_LDFLAGS])
410-
411-
# Convert @{libdir} to ${libdir} for pkg-config
412-
_OPAL_SETUP_WRAPPER_FINAL_PKGCONFIG([ORTE])
413-
414-
AC_MSG_CHECKING([for ORTE LIBS])
415-
ORTE_WRAPPER_EXTRA_LIBS="$orte_mca_wrapper_extra_libs"
416-
OPAL_FLAGS_APPEND_UNIQ([ORTE_WRAPPER_EXTRA_LIBS], [$wrapper_extra_libs])
417-
ORTE_WRAPPER_EXTRA_LIBS="$ORTE_WRAPPER_EXTRA_LIBS $with_wrapper_libs"
418-
AC_SUBST([ORTE_WRAPPER_EXTRA_LIBS])
419-
AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_LIBS])
420-
421-
m4_ifdef([project_ompi], [], [
422-
# these are used by orte_info/ompi_info (yes, they are named poorly)
423-
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS, "$ORTE_WRAPPER_EXTRA_CFLAGS",
424-
[Additional CFLAGS to pass through the wrapper compilers])
425-
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS_PREFIX, "$ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX",
426-
[Additional CFLAGS_PREFIX to pass through the wrapper compilers])
427-
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LDFLAGS, "$ORTE_WRAPPER_EXTRA_LDFLAGS",
428-
[Additional LDFLAGS to pass through the wrapper compilers])
429-
AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LIBS, "$ORTE_WRAPPER_EXTRA_LIBS",
430-
[Additional LIBS to pass through the wrapper compilers])
431-
])
432-
])
433-
434386
m4_ifdef([project_ompi], [
435387
AC_MSG_CHECKING([for OMPI CPPFLAGS])
436388
if test "$WANT_INSTALL_HEADERS" = "1" ; then

0 commit comments

Comments
 (0)