Merge pull request #10059 from awlauria/update_submodule_ptrs

bwbarrett · web-flow · commit 0f50e03d656a · 2022-03-04T15:18:15.000-08:00
master: Updating PMIx and PRRTE submodule pointers.
diff --git a/3rd-party/openpmix b/3rd-party/openpmix
@@ -1 +1 @@
-Subproject commit b98b7e83519963f7ba484ea34449668ea6834a0e
+Subproject commit 94169f1725a26a156fd73fca1b61df14ccd581ab
diff --git a/3rd-party/prrte b/3rd-party/prrte
@@ -1 +1 @@
-Subproject commit 1717de3cf3d1c079d1f55480ca5a14f20d0e723c
+Subproject commit 68df586fc9304a3e132ad0f262f6e5284fee999a
diff --git a/config/opal_config_pmix.m4 b/config/opal_config_pmix.m4
@@ -251,7 +251,7 @@ dnl Expectation is that this is called only if external fails, the
 dnl caller configured libpmix configure, and the configure script
 dnl succeeded.
 AC_DEFUN([_OPAL_CONFIG_PMIX_INTERNAL_POST], [
-    opal_pmix_CPPFLAGS="-I$OMPI_TOP_BUILDDIR/3rd-party/openpmix/include -I$OMPI_TOP_SRCDIR/3rd-party/openpmix/include"
+    opal_pmix_CPPFLAGS="-I$OMPI_TOP_BUILDDIR/3rd-party/openpmix/include -I$OMPI_TOP_SRCDIR/3rd-party/openpmix/include -I$OMPI_TOP_BUILDDIR/3rd-party/openpmix/ -I$OMPI_TOP_SRCDIR/3rd-party/openpmix/"
     opal_pmix_LDFLAGS=""
     opal_pmix_LIBS="$OMPI_TOP_BUILDDIR/3rd-party/openpmix/src/libpmix.la"
     opal_pmix_WRAPPER_LIBS="-lpmix $opal_hwloc_WRAPPER_LIBS $opal_libevent_WRAPPER_LIBS"
