diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2006-05-08 15:33:30 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2006-05-08 15:33:30 +0000 |
| commit | aa523b513f92b3d73e008860f0d90c8ef078cda0 (patch) | |
| tree | 580887a060649ab5558ad3ba30f333779a4232ff /lib/make/extras/MPI/OpenMPI | |
| parent | bad0ff24a658e71e40bc2b5afbbaeb5aa6acd643 (diff) | |
Use "$OPENMPI_DIR/lib64" for MPI_LIB_DIRS if that exists.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4290 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/extras/MPI/OpenMPI')
| -rw-r--r-- | lib/make/extras/MPI/OpenMPI | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/make/extras/MPI/OpenMPI b/lib/make/extras/MPI/OpenMPI index ca895a1a..d4a8c851 100644 --- a/lib/make/extras/MPI/OpenMPI +++ b/lib/make/extras/MPI/OpenMPI @@ -6,7 +6,7 @@ # @desc # Configure Cactus to compile with the OpenMPI version of MPI. # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/OpenMPI,v 1.1 2006-05-05 11:54:37 swhite Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/OpenMPI,v 1.2 2006-05-08 15:33:30 tradke Exp $ # @@*/ echo ' OpenMPI selected' @@ -51,10 +51,13 @@ if test -z "$OPENMPI_LIB_DIR" -o -z "$OPENMPI_INC_DIR" ; then # set OPENMPI_LIB_DIR if not already set if test -z "$OPENMPI_LIB_DIR" ; then - openmpi_libs="$OPENMPI_DIR/lib" + openmpi_libs="$OPENMPI_DIR/lib64" + if test ! -d "$openmpi_libs" ; then + openmpi_libs="$OPENMPI_DIR/lib" + fi # don't add standard library search paths - if test "$openmpi_libs" != '/usr/lib' -a "$openmpi_libs" != '/usr/local/lib'; then + if test "$openmpi_libs" != '/usr/lib' -a "$openmpi_libs" != '/usr/lib64' -a "$openmpi_libs" != '/usr/local/lib'; then OPENMPI_LIB_DIR="$openmpi_libs" fi fi |