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

Bug fix + associated test

Browse Source 
[SVN r12779]
This commit is contained in:
Dave Abrahams
2002-02-10 20:52:13 +00:00
parent e9b2c95e8a
commit b95ecfa01f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/build/build-request.jam
View File

@@ -57,7 +57,7 @@ local rule x-product-aux ( elements + : feature-space )
local result ;
local p = [ regex.split $(elements[1]) / ] ;
local f = [ set.difference $(p:G) [ $(feature-space).free-features ] ] ;
local seen ;
# No conflict with things used at a higher level?
if ! [ set.intersection $(f) : $(x-product-used) ]
{
@@ -81,6 +81,8 @@ local rule x-product-aux ( elements + : feature-space )
{
elements = ;
}
seen = $(x-product-seen) ;
}
if $(elements[2])
@@ -90,7 +92,7 @@ local rule x-product-aux ( elements + : feature-space )
# Note that we've seen these features so that higher levels will
# recurse again without them set.
x-product-seen += $(f) ;
x-product-seen += $(f) $(seen) ;
return $(result) ;
}
@@ -129,6 +131,14 @@ local rule __test__ ( )
: build-request.expand gcc-3.0.1/stlport msvc/stlport msvc debug
: $(test-space) ;
assert.result
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug
<toolset>msvc/<variant>debug
<variant>debug/<toolset>msvc/<stdlib>stlport
: build-request.expand gcc-3.0.1/stlport msvc debug msvc/stlport
: $(test-space) ;
assert.result
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>debug/<inlining>off
<toolset>gcc/<toolset-version>3.0.1/<stdlib>stlport/<variant>release/<inlining>off