diff options
| author | Christoph Junghans <christoph.junghans@gmail.com> | 2018-03-06 15:51:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 15:51:12 -0700 |
| commit | 360feb4193b5d20f064721b3e2608a7cf6ea5266 (patch) | |
| tree | b5ebc1ab9a2b96677b4d89e22b663b92b29d8178 | |
| parent | b0795d84c70cdfbb0f69bb65f713e967899d86d2 (diff) | |
| download | spack-360feb4193b5d20f064721b3e2608a7cf6ea5266.tar.gz spack-360feb4193b5d20f064721b3e2608a7cf6ea5266.tar.bz2 spack-360feb4193b5d20f064721b3e2608a7cf6ea5266.tar.xz spack-360feb4193b5d20f064721b3e2608a7cf6ea5266.zip | |
minighost: rework link logic (#7402)
| -rw-r--r-- | var/spack/repos/builtin/packages/minighost/package.py | 8 |
1 files changed, 3 insertions, 5 deletions
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: |