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

Bugfix: don't think that <toolset-msvc:version>6.0 is a composite property,

Browse Source 
during alternative selection.

Thanks to Zbynek Winkler for the bug report.


[SVN r22602]
This commit is contained in:
Vladimir Prus
2004-04-05 08:26:54 +00:00
parent 2fec39b591
commit 4073b99371
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
v2/build/targets.jam
View File

@@ -860,12 +860,20 @@ class basic-target : abstract-target
# the condition is satisfied by 'property-set'.
rule match ( property-set )
{
local condition = [ $(self.requirements).base ] ;
# Weed out conditional properties.
condition = [ MATCH ^([^:]*)\$ : $(condition) ] ;
# The condition is composed of all base non-conditional properties.
# It's not clear if we should expand 'self.requirements' or not.
# For one thing, it would be nice to be able to put
# <toolset>msvc-6.0
# in requirements.
# On the other hand, if we have <variant>release in condition it
# does not make sense to require <optimization>full to be in
# build request just to select this variant.
local bcondition = [ $(self.requirements).base ] ;
local ccondition = [ $(self.requirements).conditional ] ;
local condition = [ set.difference $(bcondition) : $(ccondition) ] ;
if $(condition) in [ $(property-set).raw ]
{
return $(condition) ;
return $(condition) ;
}
else
{