From 32cecf55eec4695eb6e1ff12c6483ba53296ff48 Mon Sep 17 00:00:00 2001 From: Mario Melara Date: Wed, 14 Dec 2016 14:37:14 -0800 Subject: [PATCH] Fix target for compiler on CNL operating systems (#2580) Changes any to a string to avoid being incorrectly added to target in compilers.yaml. --- lib/spack/spack/compiler.py | 2 +- lib/spack/spack/operating_systems/cnl.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index d5ea85a7b7b..9e9c7cbcb4b 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -117,7 +117,7 @@ def __init__(self, cspec, operating_system, target, extra_rpaths=None, **kwargs): self.spec = cspec self.operating_system = str(operating_system) - self.target = str(target) + self.target = target self.modules = modules self.alias = alias diff --git a/lib/spack/spack/operating_systems/cnl.py b/lib/spack/spack/operating_systems/cnl.py index bd128040ae9..9159597955b 100644 --- a/lib/spack/spack/operating_systems/cnl.py +++ b/lib/spack/spack/operating_systems/cnl.py @@ -58,7 +58,7 @@ def find_compiler(self, cmp_cls, *paths): v = version comp = cmp_cls( spack.spec.CompilerSpec(name + '@' + v), - self, any, + self, "any", ['cc', 'CC', 'ftn'], [cmp_cls.PrgEnv, name + '/' + v]) compilers.append(comp)