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

Use default match logic to prevent variant fallback bugs, where the requested build is ignored and an alternate is used. (merge from head)

Browse Source 
[SVN r34358]
This commit is contained in:
Rene Rivera
2006-06-19 20:11:10 +00:00
parent b4decc1e77
commit ce53d44c44
1 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
v2/tools/stlport.jam
View File

@@ -89,41 +89,15 @@ class stlport-target-class : basic-target
self.libraries = $(libraries) ;
self.version = $(version) ;
self.version.5 = [ MATCH "^(5[.][0123456789]+).*" : $(version) ] ;
}
rule match ( property-set debug ? )
{
# Override the rule which detects if this basic-target is
# suitable for the specified property set.
# Basically, just checks that requested version is equal to
# self.version. We could have added stlport-$(version) to
# requirements, but then stlport-$(version) would show in
# the common properties, causing recursive building of ourselfs.
local matched ;
if [ $(property-set).get <stdlib-stlport:version> ] = $(self.version)
local requirements ;
requirements += <stdlib-stlport:version>$(self.version) ;
if $(self.version.5)
{
if $(self.version.5)
{
# And for STLport 5.x multi-threading is required.
if [ $(property-set).get <threading> ] = multi
{
matched = stlport-$(self.version) ;
}
}
else
{
matched = stlport-$(self.version) ;
}
# For STLport 5.x multi-threading is required.
requirements += <threading>multi ;
}
matched ?= no-match ;
if $(debug)
{
ECHO " stlport.match: " $(matched) ;
}
return $(matched) ;
self.requirements = [ property-set.create $(requirements) ] ;
}
rule generate ( property-set )
@@ -133,8 +107,13 @@ class stlport-target-class : basic-target
# cause a loop in main target references. Remove that property
# manually.
property-set = [ property-set.create [ difference
[ $(property-set).raw ] : <library>/stlport//stlport <stdlib>stlport ] ] ;
property-set = [ property-set.create
[ difference
[ $(property-set).raw ] :
<library>/stlport//stlport
<stdlib>stlport
]
] ;
return [ basic-target.generate $(property-set) ] ;
}