diff options
| -rw-r--r-- | lib/spack/spack/solver/asp.py | 6 | ||||
| -rw-r--r-- | lib/spack/spack/solver/concretize.lp | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index 26a6552240..18e08b3199 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -889,8 +889,8 @@ class SpackSolverSetup(object): node_os = fn.node_os_set node_target = fn.node_target_set variant_value = fn.variant_set - node_compiler = fn.node_compiler_hard - node_compiler_version = fn.node_compiler_version_hard + node_compiler = fn.node_compiler_set + node_compiler_version = fn.node_compiler_version_set node_flag = fn.node_flag_set class Body(object): @@ -968,8 +968,6 @@ class SpackSolverSetup(object): for flag in flags: clauses.append(f.node_flag(spec.name, flag_type, flag)) - # TODO: namespace - # dependencies if spec.concrete: clauses.append(fn.concrete(spec.name)) diff --git a/lib/spack/spack/solver/concretize.lp b/lib/spack/spack/solver/concretize.lp index bbc09bde64..dd225a4da3 100644 --- a/lib/spack/spack/solver/concretize.lp +++ b/lib/spack/spack/solver/concretize.lp @@ -571,7 +571,7 @@ node_compiler_version_satisfies(Package, Compiler, Constraint) % If the compiler version was set from the command line, % respect it verbatim -node_compiler_version(Package, Compiler, Version) :- node_compiler_version_hard(Package, Compiler, Version). +node_compiler_version(Package, Compiler, Version) :- node_compiler_version_set(Package, Compiler, Version). % Cannot select a compiler if it is not supported on the OS % Compilers that are explicitly marked as allowed @@ -585,7 +585,7 @@ node_compiler_version(Package, Compiler, Version) :- node_compiler_version_hard( % Compiler prescribed in the root spec node_compiler_version_match_pref(Package, Compiler, V) - :- node_compiler_hard(Package, Compiler), + :- node_compiler_set(Package, Compiler), node_compiler_version(Package, Compiler, V), not external(Package). @@ -594,21 +594,21 @@ node_compiler_version_match_pref(Dependency, Compiler, V) :- depends_on(Package, Dependency), node_compiler_version_match_pref(Package, Compiler, V), node_compiler_version(Dependency, Compiler, V), - not node_compiler_hard(Dependency, Compiler). + not node_compiler_set(Dependency, Compiler). % Compiler inherited from the root package node_compiler_version_match_pref(Dependency, Compiler, V) :- depends_on(Package, Dependency), node_compiler_version(Package, Compiler, V), root(Package), node_compiler_version(Dependency, Compiler, V), - not node_compiler_hard(Dependency, Compiler). + not node_compiler_set(Dependency, Compiler). compiler_version_match(Package, 1) :- node_compiler_version(Package, Compiler, V), node_compiler_version_match_pref(Package, Compiler, V). -#defined node_compiler_hard/2. -#defined node_compiler_version_hard/3. +#defined node_compiler_set/2. +#defined node_compiler_version_set/3. #defined compiler_supports_os/3. #defined allow_compiler/2. |