diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py
index a77832fcb184e6a09ec4544431d31c9e1a0a282a..c86804deda843a1d4ce2ddc262fa11e9561a7fe4 100644
--- a/lib/spack/spack/architecture.py
+++ b/lib/spack/spack/architecture.py
@@ -77,6 +77,7 @@
"""
import os
import inspect
+import platform as py_platform
from llnl.util.lang import memoized, list_modules, key_ordering
from llnl.util.filesystem import join_path
@@ -334,7 +335,7 @@ def find_compiler(self, cmp_cls, *path):
if newcount <= prevcount:
continue
- compilers[ver] = cmp_cls(spec, self, paths)
+ compilers[ver] = cmp_cls(spec, self, py_platform.machine(), paths)
return list(compilers.values())
diff --git a/lib/spack/spack/cmd/compiler.py b/lib/spack/spack/cmd/compiler.py
index 80a3c71d61c840a1d857d70ada088342e6b07c77..609210f77e34a22acd124d5ae6829a87d334339e 100644
--- a/lib/spack/spack/cmd/compiler.py
+++ b/lib/spack/spack/cmd/compiler.py
@@ -32,7 +32,7 @@
from llnl.util.lang import index_by
from llnl.util.tty.colify import colify
from llnl.util.tty.color import colorize
-from spack.spec import CompilerSpec
+from spack.spec import CompilerSpec, ArchSpec
from spack.util.environment import get_path
description = "Manage compilers"
@@ -91,17 +91,26 @@ def compiler_find(args):
# Just let compiler_find do the
# entire process and return an empty config from all_compilers
# Default for any other process is init_config=True
- compilers = [c for c in spack.compilers.find_compilers(*paths)
- if c.spec not in spack.compilers.all_compilers(
- scope=args.scope, init_config=False)]
- if compilers:
- spack.compilers.add_compilers_to_config(compilers, scope=args.scope,
+ compilers = [c for c in spack.compilers.find_compilers(*paths)]
+ new_compilers = []
+ for c in compilers:
+ arch_spec = ArchSpec(None, c.operating_system, c.target)
+ same_specs = spack.compilers.compilers_for_spec(c.spec,
+ arch_spec,
+ args.scope)
+
+ if not same_specs:
+ new_compilers.append(c)
+
+ if new_compilers:
+ spack.compilers.add_compilers_to_config(new_compilers,
+ scope=args.scope,
init_config=False)
- n = len(compilers)
+ n = len(new_compilers)
s = 's' if n > 1 else ''
filename = spack.config.get_config_filename(args.scope, 'compilers')
tty.msg("Added %d new compiler%s to %s" % (n, s, filename))
- colify(reversed(sorted(c.spec for c in compilers)), indent=4)
+ colify(reversed(sorted(c.spec for c in new_compilers)), indent=4)
else:
tty.msg("Found no new compilers")
diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py
index 4a7ee614d3c8ea2599d9ae68cffe78d0a3fd5ea7..0d9727c69e620de07de58048eb271fd4e670b081 100644
--- a/lib/spack/spack/compiler.py
+++ b/lib/spack/spack/compiler.py
@@ -112,11 +112,12 @@ def fc_rpath_arg(self):
# Name of module used to switch versions of this compiler
PrgEnv_compiler = None
- def __init__(self, cspec, operating_system,
+ def __init__(self, cspec, operating_system, target,
paths, modules=[], alias=None, environment=None,
extra_rpaths=None, **kwargs):
self.spec = cspec
self.operating_system = str(operating_system)
+ self.target = str(target)
self.modules = modules
self.alias = alias
diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py
index 9a9036da8386cbfe75760a05858b05227f305715..6e65f5026974f31ae03d17452291f7a14d1c4700 100644
--- a/lib/spack/spack/compilers/__init__.py
+++ b/lib/spack/spack/compilers/__init__.py
@@ -61,6 +61,7 @@ def _to_dict(compiler):
for attr in _path_instance_vars)
d['flags'] = dict((fname, fvals) for fname, fvals in compiler.flags)
d['operating_system'] = str(compiler.operating_system)
+ d['target'] = str(compiler.target)
d['modules'] = compiler.modules if compiler.modules else []
d['environment'] = compiler.environment if compiler.environment else {}
d['extra_rpaths'] = compiler.extra_rpaths if compiler.extra_rpaths else []
@@ -216,10 +217,21 @@ def get_compilers(cspec):
if items['spec'] != str(cspec):
continue
+ # If an arch spec is given, confirm that this compiler
+ # is for the given operating system
os = items.get('operating_system', None)
if arch_spec and os != arch_spec.platform_os:
continue
+ # If an arch spec is given, confirm that this compiler
+ # is for the given target. If the target is 'any', match
+ # any given arch spec. If the compiler has no assigned
+ # target this is an old compiler config file, skip this logic.
+ target = items.get('target', None)
+ if arch_spec and target and (target != arch_spec.target and
+ target != 'any'):
+ continue
+
if not ('paths' in items and
all(n in items['paths'] for n in _path_instance_vars)):
raise InvalidCompilerConfigurationError(cspec)
@@ -244,8 +256,8 @@ def get_compilers(cspec):
extra_rpaths = items.get('extra_rpaths', [])
compilers.append(
- cls(cspec, os, compiler_paths, mods, alias, environment,
- extra_rpaths, **compiler_flags))
+ cls(cspec, os, target, compiler_paths, mods, alias,
+ environment, extra_rpaths, **compiler_flags))
return compilers
diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py
index 51d3c777fc3444a7fbb3fd514d5a6ab956a0a90e..7eb05c49c9ac2de41eb77256ce67f0596795a46b 100644
--- a/lib/spack/spack/concretize.py
+++ b/lib/spack/spack/concretize.py
@@ -305,10 +305,12 @@ def concretize_compiler(self, spec):
build with the compiler that will be used by libraries that
link to this one, to maximize compatibility.
"""
- # Pass on concretizing the compiler if the target is not yet determined
- if not spec.architecture.platform_os:
- # Although this usually means changed, this means awaiting other
- # changes
+ # Pass on concretizing the compiler if the target or operating system
+ # is not yet determined
+ if not (spec.architecture.platform_os and spec.architecture.target):
+ # We haven't changed, but other changes need to happen before we
+ # continue. `return True` here to force concretization to keep
+ # running.
return True
# Only use a matching compiler if it is of the proper style
@@ -356,7 +358,8 @@ def _proper_compiler_style(cspec, aspec):
if not matches:
arch = spec.architecture
raise UnavailableCompilerVersionError(other_compiler,
- arch.platform_os)
+ arch.platform_os,
+ arch.target)
# copy concrete version into other_compiler
try:
@@ -365,7 +368,8 @@ def _proper_compiler_style(cspec, aspec):
if _proper_compiler_style(c, spec.architecture)).copy()
except StopIteration:
raise UnavailableCompilerVersionError(
- spec.compiler, spec.architecture.platform_os
+ spec.compiler, spec.architecture.platform_os,
+ spec.architecture.target
)
assert(spec.compiler.concrete)
@@ -377,10 +381,12 @@ def concretize_compiler_flags(self, spec):
compiler is used, defaulting to no compiler flags in the spec.
Default specs set at the compiler level will still be added later.
"""
-
- if not spec.architecture.platform_os:
- # Although this usually means changed, this means awaiting other
- # changes
+ # Pass on concretizing the compiler flags if the target or operating
+ # system is not set.
+ if not (spec.architecture.platform_os and spec.architecture.target):
+ # We haven't changed, but other changes need to happen before we
+ # continue. `return True` here to force concretization to keep
+ # running.
return True
def compiler_match(spec1, spec2):
@@ -515,10 +521,11 @@ class UnavailableCompilerVersionError(spack.error.SpackError):
"""Raised when there is no available compiler that satisfies a
compiler spec."""
- def __init__(self, compiler_spec, operating_system):
+ def __init__(self, compiler_spec, operating_system, target):
super(UnavailableCompilerVersionError, self).__init__(
"No available compiler version matches '%s' on operating_system %s"
- % (compiler_spec, operating_system),
+ "for target %s"
+ % (compiler_spec, operating_system, target),
"Run 'spack compilers' to see available compiler Options.")
diff --git a/lib/spack/spack/operating_systems/cnl.py b/lib/spack/spack/operating_systems/cnl.py
index 78807865b3616df7d26a54d8d5501539a2458814..bd128040ae9059e372d401be3337a10d272a0b99 100644
--- a/lib/spack/spack/operating_systems/cnl.py
+++ b/lib/spack/spack/operating_systems/cnl.py
@@ -57,7 +57,8 @@ def find_compiler(self, cmp_cls, *paths):
for name, version in matches:
v = version
comp = cmp_cls(
- spack.spec.CompilerSpec(name + '@' + v), self,
+ spack.spec.CompilerSpec(name + '@' + v),
+ self, any,
['cc', 'CC', 'ftn'], [cmp_cls.PrgEnv, name + '/' + v])
compilers.append(comp)