summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/solver/asp.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py
index 146f816c5a..7c1a344bf1 100644
--- a/lib/spack/spack/solver/asp.py
+++ b/lib/spack/spack/solver/asp.py
@@ -497,8 +497,9 @@ class AspGenerator(object):
node_os = fn.node_os_set
node_target = fn.node_target_set
variant = fn.variant_set
- node_compiler = fn.node_compiler
- node_compiler_version = fn.node_compiler_version
+ node_compiler = fn.node_compiler_hard
+ node_compiler_version = fn.node_compiler_version_hard
+ node_flag = fn.node_flag_set
class Body(object):
node = fn.node
@@ -508,6 +509,7 @@ class AspGenerator(object):
variant = fn.variant_value
node_compiler = fn.node_compiler
node_compiler_version = fn.node_compiler_version
+ node_flag = fn.node_flag
f = Body if body else Head
@@ -564,7 +566,7 @@ class AspGenerator(object):
# compiler flags
for flag_type, flags in spec.compiler_flags.items():
for flag in flags:
- self.fact(fn.node_flag_set(spec.name, flag_type, flag))
+ self.fact(f.node_flag(spec.name, flag_type, flag))
# TODO
# external_path