From 360feb4193b5d20f064721b3e2608a7cf6ea5266 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 6 Mar 2018 15:51:12 -0700 Subject: minighost: rework link logic (#7402) --- var/spack/repos/builtin/packages/minighost/package.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index 0a258cc0dd..1ad8b9f3f4 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -54,7 +54,8 @@ class Minighost(MakefilePackage): if '+mpi' in self.spec: targets.append('PROTOCOL=-D_MG_MPI') targets.append('FC={0}'.format(self.spec['mpi'].mpif77)) - targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) + # CC is only used for linking, use it to pull in the right f77 libs + targets.append('CC={0}'.format(self.spec['mpi'].mpif77)) else: targets.append('PROTOCOL=-D_MG_SERIAL') targets.append('FC=f77') @@ -62,10 +63,7 @@ class Minighost(MakefilePackage): if '%gcc' in self.spec: targets.append('COMPILER_SUITE=gnu') - if '+mpi' in self.spec: - targets.append('LIBS=-lm -lmpi_f77 -lmpi -lgfortran') - else: - targets.append('LIBS=-lm -lgfortran') + targets.append('LIBS=-lm -lgfortran') elif '%cce' in self.spec: targets.append('COMPILER_SUITE=cray') elif '%intel' in self.spec: -- cgit v1.2.3-70-g09d2