Merge branch 'openmpi_variants' of github.com:epfl-scitas/spack into openmpi_variants

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

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

@@ -58,6 +58,12 @@ 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')
+        self.spec.mpif77 = join_path(self.prefix.bin, 'mpif77')
+
     @property
     def verbs(self):
         # Up through version 1.6, this option was previously named --with-openib
@@ -67,13 +73,6 @@ def verbs(self):
         elif self.spec.satisfies('@1.7:'):
             return 'verbs'
 
-    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 install(self, spec, prefix):
         config_args = ["--prefix=%s" % prefix,
                        "--with-hwloc=%s" % spec['hwloc'].prefix,