diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-06 15:35:34 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-06 15:35:34 -0700 |
| commit | d62766a94de455ea2d406e42e488fb7be8ce0690 (patch) | |
| tree | 5e9478d246e983edaae4b858a5a0302a7534672c /var | |
| parent | 3c8e055ed04c15d6d430da7c5a60759ac91e7b03 (diff) | |
| parent | c113d390a7a6fbd171aae54aa1f081f8b0790eab (diff) | |
| download | spack-d62766a94de455ea2d406e42e488fb7be8ce0690.tar.gz spack-d62766a94de455ea2d406e42e488fb7be8ce0690.tar.bz2 spack-d62766a94de455ea2d406e42e488fb7be8ce0690.tar.xz spack-d62766a94de455ea2d406e42e488fb7be8ce0690.zip | |
Merge pull request #756 from epfl-scitas/fixes/mpi_small_fixes
fix : mpich and mvapich2 will use spack compilers during installation
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/mpich/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/mvapich2/package.py | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 2d7955e08d..b317ec6651 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -47,12 +47,12 @@ class Mpich(Package): provides('mpi@:3.0', when='@3:') provides('mpi@:1.3', when='@1:') - def setup_dependent_environment(self, env, dependent_spec): - env.set('MPICH_CC', spack_cc) - env.set('MPICH_CXX', spack_cxx) - env.set('MPICH_F77', spack_f77) - env.set('MPICH_F90', spack_f90) - env.set('MPICH_FC', spack_fc) + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('MPICH_CC', spack_cc) + spack_env.set('MPICH_CXX', spack_cxx) + 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): """For dependencies, make mpicc's use spack wrapper.""" diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index e4e95f92af..3e60b517db 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -140,6 +140,13 @@ class Mvapich2(Package): configure_args.extend(network_options) + def setup_dependent_environment(self, spack_env, run_env, extension_spec): + spack_env.set('MPICH_CC', spack_cc) + spack_env.set('MPICH_CXX', spack_cxx) + spack_env.set('MPICH_F77', spack_f77) + spack_env.set('MPICH_F90', spack_fc) + spack_env.set('MPICH_FC', spack_fc) + def install(self, spec, prefix): # we'll set different configure flags depending on our environment configure_args = [ |