zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

concretizer: set spec constraints correctly for body and head

Browse Source
This commit is contained in:
Todd Gamblin
2020-05-13 00:07:09 -07:00
parent cd55fd4bd3
commit 5bb83be827
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/solver/asp.py
View File

@@ -497,8 +497,9 @@ class Head(object):
node_os = fn.node_os_set node_os = fn.node_os_set
node_target = fn.node_target_set node_target = fn.node_target_set
variant = fn.variant_set variant = fn.variant_set
node_compiler = fn.node_compiler node_compiler = fn.node_compiler_hard
node_compiler_version = fn.node_compiler_version node_compiler_version = fn.node_compiler_version_hard
node_flag = fn.node_flag_set
class Body(object): class Body(object):
node = fn.node node = fn.node
@@ -508,6 +509,7 @@ class Body(object):
variant = fn.variant_value variant = fn.variant_value
node_compiler = fn.node_compiler node_compiler = fn.node_compiler
node_compiler_version = fn.node_compiler_version node_compiler_version = fn.node_compiler_version
node_flag = fn.node_flag
f = Body if body else Head f = Body if body else Head
@@ -564,7 +566,7 @@ class Body(object):
# compiler flags # compiler flags
for flag_type, flags in spec.compiler_flags.items(): for flag_type, flags in spec.compiler_flags.items():
for flag in flags: 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 # TODO
# external_path # external_path