zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mvapich2: Fix mpifort wrapper (#4650)

Browse Source
This commit is contained in:
Michael Kuhn 2017-06-30 18:51:07 +02:00 committed by Adam J. Stewart
parent cabcfb032f
commit 2e6a735b00
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/mvapich2/package.py
View File

@ -235,6 +235,7 @@ def filter_compilers(self):
mpicxx = join_path(bin, 'mpicxx') mpicxx = join_path(bin, 'mpicxx')
mpif77 = join_path(bin, 'mpif77') mpif77 = join_path(bin, 'mpif77')
mpif90 = join_path(bin, 'mpif90') mpif90 = join_path(bin, 'mpif90')
mpifort = join_path(bin, 'mpifort')
# Substitute Spack compile wrappers for the real # Substitute Spack compile wrappers for the real
# underlying compiler # underlying compiler
@ -243,8 +244,9 @@ def filter_compilers(self):
filter_file(env['CXX'], self.compiler.cxx, mpicxx, **kwargs) filter_file(env['CXX'], self.compiler.cxx, mpicxx, **kwargs)
filter_file(env['F77'], self.compiler.f77, mpif77, **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, mpif90, **kwargs)
filter_file(env['FC'], self.compiler.fc, mpifort, **kwargs)
# Remove this linking flag if present # Remove this linking flag if present
# (it turns RPATH into RUNPATH) # (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) filter_file('-Wl,--enable-new-dtags', '', wrapper, **kwargs)