From 5bb83be827091d7e8630dd0842dd7f61f40b67fa Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 13 May 2020 00:07:09 -0700 Subject: concretizer: set spec constraints correctly for body and head --- lib/spack/spack/solver/asp.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib') 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 -- cgit v1.2.3-60-g2f50