Fixup for target preferences
This commit is contained in:
parent
e0ae60edc4
commit
1b0338befb
@ -1080,7 +1080,7 @@ def preferred_targets(self, pkg_name):
|
|||||||
|
|
||||||
preferred = preferred_targets[0]
|
preferred = preferred_targets[0]
|
||||||
self.gen.fact(fn.package_target_weight(
|
self.gen.fact(fn.package_target_weight(
|
||||||
str(preferred.architecture.target), pkg_name, -10
|
str(preferred.architecture.target), pkg_name, -30
|
||||||
))
|
))
|
||||||
|
|
||||||
def preferred_versions(self, pkg_name):
|
def preferred_versions(self, pkg_name):
|
||||||
@ -1190,7 +1190,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.gen.fact(f.node_flag(spec.name, flag_type, flag))
|
clauses.append(f.node_flag(spec.name, flag_type, flag))
|
||||||
|
|
||||||
# TODO
|
# TODO
|
||||||
# namespace
|
# namespace
|
||||||
|
@ -432,7 +432,15 @@ node_flag_source(Dependency, Q)
|
|||||||
:- node_flag_source(Package, Q), inherit_flags(Package, Dependency).
|
:- node_flag_source(Package, Q), inherit_flags(Package, Dependency).
|
||||||
|
|
||||||
% compiler flags from compilers.yaml are put on nodes if compiler matches
|
% compiler flags from compilers.yaml are put on nodes if compiler matches
|
||||||
node_flag(Package, FlagType, Flag),
|
node_flag(Package, FlagType, Flag)
|
||||||
|
:- not node_flag_set(Package),
|
||||||
|
compiler_version_flag(Compiler, Version, FlagType, Flag),
|
||||||
|
node_compiler(Package, Compiler),
|
||||||
|
node_compiler_version(Package, Compiler, Version),
|
||||||
|
flag_type(FlagType),
|
||||||
|
compiler(Compiler),
|
||||||
|
compiler_version(Compiler, Version).
|
||||||
|
|
||||||
node_flag_compiler_default(Package)
|
node_flag_compiler_default(Package)
|
||||||
:- not node_flag_set(Package),
|
:- not node_flag_set(Package),
|
||||||
compiler_version_flag(Compiler, Version, FlagType, Flag),
|
compiler_version_flag(Compiler, Version, FlagType, Flag),
|
||||||
|
Loading…
Reference in New Issue
Block a user