diff options
author | Mario Melara <maamelara@gmail.com> | 2016-02-11 11:15:19 -0800 |
---|---|---|
committer | Mario Melara <maamelara@gmail.com> | 2016-02-11 11:15:19 -0800 |
commit | b9d09202c9856bf173c4bbabd4b73573d355d408 (patch) | |
tree | 520c11a5d873ca4de99675401044b1f8d41e42fa /lib | |
parent | 77e93e1b791f1c264a999de3b59f2e6396e13391 (diff) | |
download | spack-b9d09202c9856bf173c4bbabd4b73573d355d408.tar.gz spack-b9d09202c9856bf173c4bbabd4b73573d355d408.tar.bz2 spack-b9d09202c9856bf173c4bbabd4b73573d355d408.tar.xz spack-b9d09202c9856bf173c4bbabd4b73573d355d408.zip |
changed some variables to account for the fact that target is now a tuple
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/spack/concretize.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index d78c102d93..8886b3cd93 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -212,7 +212,7 @@ class DefaultConcretizer(object): def _concretize_operating_system(self, arch, platform): """ Future method for concretizing operating system """ - if isinstance(arch.arch_os, OperatingSystem): + if isinstance(arch.arch_os, spack.architecture.OperatingSystem): return False else: arch.arch_os = platform.operating_system('default') @@ -240,13 +240,12 @@ class DefaultConcretizer(object): Arch = collections.namedtuple("Arch", "arch_os target") spec.target = Arch(arch_os=platform.operating_system('default'), target=platform.target('default')) - - return True + return True # If there is a target and it is a tuple and has both filled return # False if not isinstance(spec.target, basestring): return any((self._concretize_operating_system(spec.target, platform), - self._concretize_arch_target(spec.target, plarform))) + self._concretize_arch_target(spec.target, platform))) else: spec.add_target_from_string(spec.target) @@ -316,9 +315,9 @@ class DefaultConcretizer(object): # Should think whether this can be more efficient def _proper_compiler_style(cspec, target): compilers = spack.compilers.compilers_for_spec(cspec) - if target.compiler_strategy == 'PATH': + if target.target.compiler_strategy == 'PATH': filter(lambda c: not c.modules, compilers) - if target.compiler_strategy == 'MODULES': + if target.target.compiler_strategy == 'MODULES': filter(lambda c: c.modules, compilers) return compilers |