mpi: move mpicc/mpicxx/mpifc/mpif77 to setup_dependent_package()

var/spack/repos/builtin/packages/mpich/package.py

@@ -54,12 +54,12 @@ def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
         spack_env.set('MPICH_F90', spack_fc)
         spack_env.set('MPICH_FC', spack_fc)
 
+    def setup_dependent_package(self, module, dep_spec):
         self.spec.mpicc  = join_path(self.prefix.bin, 'mpicc')
         self.spec.mpicxx = join_path(self.prefix.bin, 'mpic++')
         self.spec.mpifc  = join_path(self.prefix.bin, 'mpif90')
         self.spec.mpif77 = join_path(self.prefix.bin, 'mpif77')
 
-    def setup_dependent_package(self, module, dep_spec):
         """For dependencies, make mpicc's use spack wrapper."""
         # FIXME : is this necessary ? Shouldn't this be part of a contract with MPI providers?
         module.mpicc = join_path(self.prefix.bin, 'mpicc')

var/spack/repos/builtin/packages/mvapich2/package.py

@@ -146,6 +146,8 @@ def setup_dependent_environment(self, spack_env, run_env, extension_spec):
         spack_env.set('MPICH_F77', spack_f77)
         spack_env.set('MPICH_F90', spack_fc)
         spack_env.set('MPICH_FC', spack_fc)
+
+    def setup_dependent_package(self, module, dep_spec):
         self.spec.mpicc  = join_path(self.prefix.bin, 'mpicc')
         self.spec.mpicxx = join_path(self.prefix.bin, 'mpicxx')
         self.spec.mpifc  = join_path(self.prefix.bin, 'mpif90')

var/spack/repos/builtin/packages/openmpi/package.py

@@ -45,6 +45,7 @@ def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
         spack_env.set('OMPI_FC', spack_fc)
         spack_env.set('OMPI_F77', spack_f77)
 
+    def setup_dependent_package(self, module, dep_spec):
         self.spec.mpicc  = join_path(self.prefix.bin, 'mpicc')
         self.spec.mpicxx = join_path(self.prefix.bin, 'mpic++')
         self.spec.mpifc  = join_path(self.prefix.bin, 'mpif90')