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

Merge from trunk

Browse Source 
[SVN r34085]
This commit is contained in:
Vladimir Prus
2006-05-25 08:00:13 +00:00
parent c19a39d0a8
commit a8e8f737ea
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
v2/build/property.jam
View File

@@ -139,19 +139,12 @@ rule expand-subfeatures-in-conditions ( properties * )
local e ;
for local c in $(condition)
{
if [ MATCH "^(<toolset>|<toolset->)" : $(c:G) ] ||
[ MATCH "^(<os>)" : $(c:G) ]
{
# It common that condition includes a toolset which
# was never defined, or mentiones subfeatures which
# were never defined. In that case, validation will
# only produce an spirious error, so don't validate.
e += [ feature.expand-subfeatures $(c) : true ] ;
}
else
{
e += [ feature.expand-subfeatures $(c) ] ;
}
# It common that condition includes a toolset which
# was never defined, or mentiones subfeatures which
# were never defined. In that case, validation will
# only produce an spirious error, so prevent
# validation by passing 'true' as second parameter.
e += [ feature.expand-subfeatures $(c) : true ] ;
}
if $(e) = $(condition)