summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2020-05-13 00:07:09 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2020-11-17 10:04:13 -0800
commit5bb83be827091d7e8630dd0842dd7f61f40b67fa (patch)
tree88b20d00411ae93dc4a1f8e5388253519dd4e84e /lib
parentcd55fd4bd3af0dcb1c92954ef36eb2a3e530b505 (diff)
downloadspack-5bb83be827091d7e8630dd0842dd7f61f40b67fa.tar.gz
spack-5bb83be827091d7e8630dd0842dd7f61f40b67fa.tar.bz2
spack-5bb83be827091d7e8630dd0842dd7f61f40b67fa.tar.xz
spack-5bb83be827091d7e8630dd0842dd7f61f40b67fa.zip
concretizer: set spec constraints correctly for body and head
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