--- configure.orig 2017-09-12 14:34:37.000000000 -0700
+++ configure 2019-05-10 09:43:26.000000000 -0700
@@ -402860,9 +402860,9 @@
# rather than have successive assignments to these shell
# variables, lest the $(foo) names try to get evaluated here.
- CPPFLAGS='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_builddir)/orte/include -I$(top_srcdir)/ompi/include -I$(top_srcdir)/oshmem/include'" $CPPFLAGS"
+ CPPFLAGS='-idirafter$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_builddir)/orte/include -I$(top_srcdir)/ompi/include -I$(top_srcdir)/oshmem/include'" $CPPFLAGS"
# C++ is only relevant if we're building OMPI
- CXXCPPFLAGS='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_srcdir)/ompi/include'" $CXXCPPFLAGS"
+ CXXCPPFLAGS='-idirafter$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_srcdir)/ompi/include'" $CXXCPPFLAGS"
CPPFLAGS='-I$(top_srcdir) -I$(top_srcdir)/orte/include'" $CPPFLAGS"
# C++ is only relevant if we're building OMPI