diff options
author | Mario Melara <maamelara@gmail.com> | 2016-06-06 09:04:24 -0700 |
---|---|---|
committer | Mario Melara <maamelara@gmail.com> | 2016-06-06 09:04:24 -0700 |
commit | c7b48f6fef92167b55d901e47a50e3f704fd65ec (patch) | |
tree | 012a6d31870e9ae0fd11691af2501caa070cec48 | |
parent | f751d681771499b1da46216f46beb0a074fa73e7 (diff) | |
download | spack-c7b48f6fef92167b55d901e47a50e3f704fd65ec.tar.gz spack-c7b48f6fef92167b55d901e47a50e3f704fd65ec.tar.bz2 spack-c7b48f6fef92167b55d901e47a50e3f704fd65ec.tar.xz spack-c7b48f6fef92167b55d901e47a50e3f704fd65ec.zip |
Passing full arch for proper compiler spec so that we can use the platform to get the operating system
-rw-r--r-- | lib/spack/spack/concretize.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index 58811c3419..1f37455c77 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -280,10 +280,12 @@ class DefaultConcretizer(object): # Only use a matching compiler if it is of the proper style # Takes advantage of the proper logic already existing in compiler_for_spec # Should think whether this can be more efficient - def _proper_compiler_style(cspec, architecture): - compilers = spack.compilers.compilers_for_spec(cspec) - return filter(lambda c: c.operating_system == - architecture.platform_os, compilers) + def _proper_compiler_style(cspec, arch): + platform = arch.platform + compilers = spack.compilers.compilers_for_spec(cspec, + platform=platform) + return filter(lambda c: c.operating_system == + arch.platform_os, compilers) #return compilers @@ -368,7 +370,7 @@ class DefaultConcretizer(object): # Include the compiler flag defaults from the config files # This ensures that spack will detect conflicts that stem from a change # in default compiler flags. - compiler = spack.compilers.compiler_for_spec(spec.compiler, spec.architecture.platform_os) + compiler = spack.compilers.compiler_for_spec(spec.compiler, spec.architecture) for flag in compiler.flags: if flag not in spec.compiler_flags: spec.compiler_flags[flag] = compiler.flags[flag] |