open-mpi and mpich conflict

2 files changed, 8 insertions, 11 deletions

diff --git a/Library/Formula/mpich2.rb b/Library/Formula/mpich2.rb
index 363d01f3b..9eef1aa8a 100644
--- a/Library/Formula/mpich2.rb
+++ b/Library/Formula/mpich2.rb
@@ -19,6 +19,8 @@ class Mpich2 < Formula
   option 'disable-fortran', "Do not attempt to build Fortran bindings"
   option 'enable-shared', "Build shared libraries"
 
+  conflicts_with 'open-mpi', :because => 'both install mpi__ compiler wrappers'
+
   # fails with clang from Xcode 4.5.1 on 10.7 and 10.8 (see #15533)
   # linker bug appears to have been fixed by Xcode 4.6
   fails_with :clang do
@@ -61,13 +63,6 @@ class Mpich2 < Formula
     system "make install"
   end
 
-  def caveats; <<-EOS.undent
-    Please be aware that installing this formula along with the `openmpi`
-    formula will cause neither MPI installation to work correctly as
-    both packages install their own versions of mpicc/mpicxx and mpirun.
-    EOS
-  end
-
   def test
     # a better test would be to build and run a small MPI program
     system "#{bin}/mpicc", "-show"
diff --git a/Library/Formula/open-mpi.rb b/Library/Formula/open-mpi.rb
index d3c2cf0b2..67d34e84b 100644
--- a/Library/Formula/open-mpi.rb
+++ b/Library/Formula/open-mpi.rb
@@ -10,6 +10,12 @@ class OpenMpi < Formula
     sha1 '38b6f2598a071311ae6f5ccaf13dffd6154ccfff'
   end
 
+  option 'disable-fortran', 'Do not build the Fortran bindings'
+  option 'test', 'Verify the build with make check'
+  option 'enable-mpi-thread-multiple', 'Enable MPI_THREAD_MULTIPLE'
+
+  conflicts_with 'mpich2', :because => 'both install mpi__ compiler wrappers'
+
   # Reported upstream at version 1.6, both issues
   # http://www.open-mpi.org/community/lists/devel/2012/05/11003.php
   # http://www.open-mpi.org/community/lists/devel/2012/08/11362.php
@@ -18,10 +24,6 @@ class OpenMpi < Formula
     cause 'fails make check on Lion and ML'
   end if not build.devel?
 
-  option 'disable-fortran', 'Do not build the Fortran bindings'
-  option 'test', 'Verify the build with make check'
-  option 'enable-mpi-thread-multiple', 'Enable MPI_THREAD_MULTIPLE'
-
   def install
     args = %W[
       --prefix=#{prefix}