diff options
| -rw-r--r-- | lib/spack/spack/compilers/__init__.py | 4 | ||||
| -rw-r--r-- | lib/spack/spack/test/compilers.py | 26 |
2 files changed, 29 insertions, 1 deletions
diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index 84f767d1dd..5adfd17b1a 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -383,7 +383,9 @@ def compiler_for_spec(compiler_spec, arch_spec): if len(compilers) < 1: raise NoCompilerForSpecError(compiler_spec, arch_spec.os) if len(compilers) > 1: - raise CompilerDuplicateError(compiler_spec, arch_spec) + msg = 'Multiple definitions of compiler %s' % compiler_spec + msg += 'for architecture %s:\n %s' % (arch_spec, compilers) + tty.debug(msg) return compilers[0] diff --git a/lib/spack/spack/test/compilers.py b/lib/spack/spack/test/compilers.py index 1b66b692e0..84233d604f 100644 --- a/lib/spack/spack/test/compilers.py +++ b/lib/spack/spack/test/compilers.py @@ -50,6 +50,32 @@ def make_args_for_version(monkeypatch): return _factory +def test_multiple_conflicting_compiler_definitions(mutable_config): + compiler_def = { + 'compiler': { + 'flags': {}, + 'modules': [], + 'paths': { + 'cc': 'cc', + 'cxx': 'cxx', + 'f77': 'null', + 'fc': 'null'}, + 'extra_rpaths': [], + 'operating_system': 'test', + 'target': 'test', + 'environment': {}, + 'spec': 'clang@0.0.0'}} + + compiler_config = [compiler_def, compiler_def] + compiler_config[0]['compiler']['paths']['f77'] = 'f77' + mutable_config.update_config('compilers', compiler_config) + + arch_spec = spack.spec.ArchSpec('test', 'test', 'test') + cspec = compiler_config[0]['compiler']['spec'] + cmp = compilers.compiler_for_spec(cspec, arch_spec) + assert cmp.f77 == 'f77' + + def test_get_compiler_duplicates(config): # In this case there is only one instance of the specified compiler in # the test configuration (so it is not actually a duplicate), but the |