Bugfix in concretize_compiler (#2196)

* fix bug in search for concrete compiler

* simplify implementation of concretize_compiler

* fix flake8 errors
This commit is contained in:
Jeffrey Salmond 2016-11-05 06:20:49 +00:00 committed by Todd Gamblin
parent 6d1c32d46a
commit a260e7e860

View File

@ -385,14 +385,13 @@ def _proper_compiler_style(cspec, arch):
arch.platform_os) arch.platform_os)
# copy concrete version into other_compiler # copy concrete version into other_compiler
index = 0 try:
while not _proper_compiler_style(matches[index], spec.architecture): spec.compiler = next(
index += 1 c for c in matches
if index == len(matches) - 1: if _proper_compiler_style(c, spec.architecture)).copy()
arch = spec.architecture except StopIteration:
raise UnavailableCompilerVersionError(spec.compiler, raise UnavailableCompilerVersionError(spec.compiler,
arch.platform_os) arch.platform_os)
spec.compiler = matches[index].copy()
assert(spec.compiler.concrete) assert(spec.compiler.concrete)
return True # things changed. return True # things changed.