Skip to content

Commit 54d95d9

Browse files
committed
mpiext/*/use-mpi-f08: ensure CPPFLAGS don't propagate
The CPPFLAGS may not be understood by the Fortran compiler. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
1 parent a5aef2d commit 54d95d9

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

ompi/mpiext/example/use-mpi-f08/Makefile.am

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
# This file builds the use_mpi_f08-based bindings for MPI extensions. It
1313
# is optional in MPI extensions.
1414

15+
# Note that Automake's Fortran-buidling rules uses CPPFLAGS and
16+
# AM_CPPFLAGS. This can cause weirdness (e.g.,
17+
# https://github.com/open-mpi/ompi/issues/7253). Let's just zero
18+
# those out and rely on AM_FCFLAGS.
19+
CPPFLAGS =
20+
AM_CPPFLAGS =
21+
1522
# We must set these #defines and include paths so that the inner OMPI
1623
# MPI prototype header files do the Right Thing.
1724
AM_FCFLAGS = $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-f08/mod \

ompi/mpiext/ftmpi/use-mpi-f08/Makefile.am

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@
1616
# This file builds the use_mpi_f08-based bindings for MPI extensions. It
1717
# is optional in MPI extensions.
1818

19+
# Note that Automake's Fortran-buidling rules uses CPPFLAGS and
20+
# AM_CPPFLAGS. This can cause weirdness (e.g.,
21+
# https://github.com/open-mpi/ompi/issues/7253). Let's just zero
22+
# those out and rely on AM_FCFLAGS.
23+
CPPFLAGS =
24+
AM_CPPFLAGS =
25+
1926
# We must set these #defines and include paths so that the inner OMPI
2027
# MPI prototype header files do the Right Thing.
2128
AM_FCFLAGS = $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \

0 commit comments

Comments
 (0)