boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix bad selection of dependents when rules in the targets change the requirements.

Browse Source 
[SVN r25196]
This commit is contained in:
Rene Rivera
2004-09-18 18:36:33 +00:00
parent 2d74f24670
commit 52e22c12f5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
v1/boost-base.jam
View File

@@ -1562,6 +1562,7 @@ rule find-compatible-subvariant ( main-target : toolset variant : dependent-simp
[ intersection $(sv-request) : $(build-requests) ] ;
sv-build ?= "" ;
local BUILD = $(variant) [ split-path $(sv-build) ] ;
local gTARGET_DEFAULT_BUILD($(main-target)) = ;
# the full subvariant to build...
local subvariant = [ expand-target-subvariants $(main-target) : $(variant) : $(toolset) ] ;
@@ -1569,6 +1570,9 @@ rule find-compatible-subvariant ( main-target : toolset variant : dependent-simp
split-target-subvariant sv-target sv-properties sv-toolset sv-variant : $(subvariant) ;
local sv-overrides =
[ difference $(dependent-simple-properties) : [ select-gristed $(sv-properties) ] ] ;
sv-overrides +=
[ get-properties
[ difference $(dependent-simple-properties:G) : $(sv-overrides:G) ] : $(sv-properties) ] ;
if ! $(gTARGET_TYPE($(main-target)))
{
@@ -1583,7 +1587,8 @@ rule find-compatible-subvariant ( main-target : toolset variant : dependent-simp
for local sv-override in $(override-conflicts)
{
local sv-required = [ get-values $(sv-override:G) : $(sv-properties) ] ;
if ! [ is-link-compatible $(sv-override:G) : $(sv-override:G=) : $(sv-required) ]
if $(sv-override:G=) != $(sv-required) &&
! [ is-link-compatible $(sv-override:G) : $(sv-override:G=) : $(sv-required) ]
{
EXIT $(main-target): required property $(sv-override:G)$(sv-required)
incompatible with $(sv-override) ;