diff options
| author | Mario Melara <maamelara@gmail.com> | 2016-12-14 14:37:14 -0800 |
|---|---|---|
| committer | becker33 <becker33@llnl.gov> | 2016-12-14 14:37:14 -0800 |
| commit | 32cecf55eec4695eb6e1ff12c6483ba53296ff48 (patch) | |
| tree | c43ed65f85bfd1a8d550e347c9c57858eff60c6c /lib | |
| parent | 8816cdea9e4283361e917821488e38cd2ed9574f (diff) | |
| download | spack-32cecf55eec4695eb6e1ff12c6483ba53296ff48.tar.gz spack-32cecf55eec4695eb6e1ff12c6483ba53296ff48.tar.bz2 spack-32cecf55eec4695eb6e1ff12c6483ba53296ff48.tar.xz spack-32cecf55eec4695eb6e1ff12c6483ba53296ff48.zip | |
Fix target for compiler on CNL operating systems (#2580)
Changes any to a string to avoid <built-in function any> being
incorrectly added to target in compilers.yaml.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/compiler.py | 2 | ||||
| -rw-r--r-- | 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 d5ea85a7b7..9e9c7cbcb4 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -117,7 +117,7 @@ class Compiler(object): 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 bd128040ae..9159597955 100644 --- a/lib/spack/spack/operating_systems/cnl.py +++ b/lib/spack/spack/operating_systems/cnl.py @@ -58,7 +58,7 @@ class Cnl(OperatingSystem): 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) |