From 2e6a735b0043bebe8c6ff88f21c1bb2de0063135 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 30 Jun 2017 18:51:07 +0200 Subject: mvapich2: Fix mpifort wrapper (#4650) --- var/spack/repos/builtin/packages/mvapich2/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 7a3d8f1e02..b20bf76e93 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -235,6 +235,7 @@ class Mvapich2(AutotoolsPackage): mpicxx = join_path(bin, 'mpicxx') mpif77 = join_path(bin, 'mpif77') mpif90 = join_path(bin, 'mpif90') + mpifort = join_path(bin, 'mpifort') # Substitute Spack compile wrappers for the real # underlying compiler @@ -243,8 +244,9 @@ class Mvapich2(AutotoolsPackage): filter_file(env['CXX'], self.compiler.cxx, mpicxx, **kwargs) filter_file(env['F77'], self.compiler.f77, mpif77, **kwargs) filter_file(env['FC'], self.compiler.fc, mpif90, **kwargs) + filter_file(env['FC'], self.compiler.fc, mpifort, **kwargs) # Remove this linking flag if present # (it turns RPATH into RUNPATH) - for wrapper in (mpicc, mpicxx, mpif77, mpif90): + for wrapper in (mpicc, mpicxx, mpif77, mpif90, mpifort): filter_file('-Wl,--enable-new-dtags', '', wrapper, **kwargs) -- cgit v1.2.3-70-g09d2