From 758c7fec4f071ce0b0d6a2473f9071012c40ea62 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 17 Nov 2010 09:17:25 +0100 Subject: [PATCH] Revert "ENH: set MPI_ARCH_PATCH for ThirdParty Allwmake" This reverts commit d7d88b7d89c327a3f2a203d4d9c91487235ed4ac. - ThirdParty Allwmake now handles SYSTEMOPENMPI directly without this kludge --- etc/settings.csh | 5 +---- etc/settings.sh | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/etc/settings.csh b/etc/settings.csh index 4fd95a1c9d..e1884cd1c3 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -236,12 +236,9 @@ case OPENMPI: breaksw case SYSTEMOPENMPI: - # use the system installed openmpi, get library directory via mpicc + # Use the system installed openmpi, get library directory via mpicc set mpi_version=openmpi-system - # Set to dummy value (but existing directory) - setenv MPI_ARCH_PATH / - # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI setenv PINC "`mpicc --showme:compile`" setenv PLIBS "`mpicc --showme:link`" diff --git a/etc/settings.sh b/etc/settings.sh index 9f46523377..5b2f516505 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -261,12 +261,9 @@ OPENMPI) ;; SYSTEMOPENMPI) - # use the system installed openmpi, get library directory via mpicc + # Use the system installed openmpi, get library directory via mpicc mpi_version=openmpi-system - # Set to dummy (but existing directory). Used in Thirdparty Allwmake. - export MPI_ARCH_PATH=/ - # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI export PINC="`mpicc --showme:compile`" export PLIBS="`mpicc --showme:link`"