Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 5bee5d5

Browse files
author
rhc54
committed
Merge pull request #994 from jsquyres/pr/v1.10/fix-use-mpi-examples-makefile
v1.10 examples: fix check for Fortran "use mpi" bindings
2 parents 0490043 + a4b23c1 commit 5bee5d5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

examples/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2006-2007 Sun Microsystems, Inc. All rights reserved.
13-
# Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2011-2016 Cisco Systems, Inc. All rights reserved.
1414
# Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
1515
# Copyright (c) 2013 Mellanox Technologies, Inc. All rights reserved.
1616
# $COPYRIGHT$
@@ -84,19 +84,19 @@ all: hello_c ring_c connectivity_c
8484
# MPI examples
8585

8686
mpi:
87-
@ if ompi_info --parsable | grep bindings:cxx:yes >/dev/null; then \
87+
@ if ompi_info --parsable | grep -q bindings:cxx:yes >/dev/null; then \
8888
$(MAKE) hello_cxx ring_cxx; \
8989
fi
90-
@ if ompi_info --parsable | grep bindings:mpif.h:yes >/dev/null; then \
90+
@ if ompi_info --parsable | grep -q bindings:mpif.h:yes >/dev/null; then \
9191
$(MAKE) hello_mpifh ring_mpifh; \
9292
fi
93-
@ if ompi_info --parsable | grep bindings:use_mpi:yes >/dev/null; then \
93+
@ if ompi_info --parsable | egrep -q bindings:use_mpi:\"\?yes >/dev/null; then \
9494
$(MAKE) hello_usempi ring_usempi; \
9595
fi
96-
@ if ompi_info --parsable | grep bindings:use_mpi_f08:yes >/dev/null; then \
96+
@ if ompi_info --parsable | grep -q bindings:use_mpi_f08:yes >/dev/null; then \
9797
$(MAKE) hello_usempif08 ring_usempif08; \
9898
fi
99-
@ if ompi_info --parsable | grep bindings:java:yes >/dev/null; then \
99+
@ if ompi_info --parsable | grep -q bindings:java:yes >/dev/null; then \
100100
$(MAKE) Hello.class Ring.class; \
101101
fi
102102

0 commit comments

Comments
 (0)