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

Fix subvariant generation of dependents to correctly transmit/match dependant requirements/requests.

Browse Source 
[SVN r13352]
This commit is contained in:
Rene Rivera
2002-04-03 06:42:55 +00:00
parent 9190bf3ef1
commit 97f7854cfe
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
boost-base.jam
View File

@@ -1375,10 +1375,18 @@ rule is-link-compatible ( feature : value1 : value2 )
rule find-compatible-subvariant ( main-target : toolset variant : dependent-simple-properties * )
{
# calculate the subvariant only of what is requested
local BUILD = $(variant)
[ intersection
[ multiply-property-sets [ select-gristed $(BUILD) ] ] :
$(dependent-simple-properties) ] ;
# the subvariant requested...
local sv-request =
[ multiply-property-sets
[ get-properties $(BUILD:G) : $(dependent-simple-properties) ] ] ;
# the available build requests...
local build-requests =
[ multiply-property-sets [ select-gristed $(BUILD) ] ] ;
# the build requst we want to build...
local sv-build =
[ split-path [ intersection $(sv-request) : $(build-requests) ] ] ;
local BUILD = $(variant) $(sv-build) ;
# the full subvariant to build...
local subvariant = [ expand-target-subvariants $(main-target) : $(variant) : $(toolset) ] ;
local sv-target = ;

16
v1/boost-base.jam
View File

@@ -1375,10 +1375,18 @@ rule is-link-compatible ( feature : value1 : value2 )
rule find-compatible-subvariant ( main-target : toolset variant : dependent-simple-properties * )
{
# calculate the subvariant only of what is requested
local BUILD = $(variant)
[ intersection
[ multiply-property-sets [ select-gristed $(BUILD) ] ] :
$(dependent-simple-properties) ] ;
# the subvariant requested...
local sv-request =
[ multiply-property-sets
[ get-properties $(BUILD:G) : $(dependent-simple-properties) ] ] ;
# the available build requests...
local build-requests =
[ multiply-property-sets [ select-gristed $(BUILD) ] ] ;
# the build requst we want to build...
local sv-build =
[ split-path [ intersection $(sv-request) : $(build-requests) ] ] ;
local BUILD = $(variant) $(sv-build) ;
# the full subvariant to build...
local subvariant = [ expand-target-subvariants $(main-target) : $(variant) : $(toolset) ] ;
local sv-target = ;