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

call the universal 'mpifc' instead of hardcode 'mpif90' (#18162)

Browse Source 
Co-authored-by: Daryl W. Grunau <dwg@lanl.gov>
This commit is contained in:
Daryl W. Grunau 2020-08-24 14:44:20 -06:00 committed by GitHub
parent 17f7d9f44c
commit f5102cd582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -430,7 +430,6 @@ def define_tpl_enable(cmake_var, spec_var=None):
# Force Trilinos to use the MPI wrappers instead of raw compilers # Force Trilinos to use the MPI wrappers instead of raw compilers
# this is needed on Apple systems that require full resolution of # this is needed on Apple systems that require full resolution of
# all symbols when linking shared libraries # all symbols when linking shared libraries
mpi_bin = spec['mpi'].prefix.bin
options.extend([ options.extend([
define('CMAKE_C_COMPILER', spec['mpi'].mpicc), define('CMAKE_C_COMPILER', spec['mpi'].mpicc),
define('CMAKE_CXX_COMPILER', spec['mpi'].mpicxx), define('CMAKE_CXX_COMPILER', spec['mpi'].mpicxx),
@ -690,7 +689,7 @@ def define_tpl_enable(cmake_var, spec_var=None):
if '+mpi' in spec: if '+mpi' in spec:
libgfortran = os.path.dirname(os.popen( libgfortran = os.path.dirname(os.popen(
'%s --print-file-name libgfortran.a' % '%s --print-file-name libgfortran.a' %
join_path(mpi_bin, 'mpif90')).read()) spec['mpi'].mpifc).read())
options.append(define( options.append(define(
'Trilinos_EXTRA_LINK_FLAGS', 'Trilinos_EXTRA_LINK_FLAGS',
'-L%s/ -lgfortran' % (libgfortran), '-L%s/ -lgfortran' % (libgfortran),