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 missing paths when the "std::*-support", or any other requirements rule, modifies the requirements property set.

Browse Source 
[SVN r20083]
This commit is contained in:
Rene Rivera
2003-09-17 03:24:15 +00:00
parent eb57a08007
commit 29206dde68
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
boost-base.jam
View File

@@ -1843,13 +1843,15 @@ rule expand-target-subvariants ( target : local-build * : tools + : )
{
properties = [ $(r) $(toolset) $(variant) : $(properties) ] ;
}
properties = [ join $(properties) : $(SLASH) ] ;
# the rules may have modified the build request, reconstruct it
properties = [ expand-build-request $(toolset) $(variant) $(target)
: $(properties[2-]) : $(build-request) ] ;
subvariants += $(target)|$(properties)|$(toolset)|$(variant) ;
}
}
}
return $(subvariants) ;
return [ unique $(subvariants) ] ;
}
# Given an expanded subvariant of a terget, sets the various variables accordingly.
@@ -2463,10 +2465,6 @@ rule force-NT-static-link ( pattern : toolset : subvariant-path properties * )
{
if $(NT) && [ MATCH $(pattern) : $(toolset) ]
{
local p = [ MATCH (.*)runtime-link-dynamic(.*) : $(subvariant-path) ] ;
subvariant-path = $(p[1])runtime-link-static$(p[2]) ;
properties =
[ difference $(properties) : <runtime-link>dynamic ]
<runtime-link>static

10
v1/boost-base.jam
View File

@@ -1843,13 +1843,15 @@ rule expand-target-subvariants ( target : local-build * : tools + : )
{
properties = [ $(r) $(toolset) $(variant) : $(properties) ] ;
}
properties = [ join $(properties) : $(SLASH) ] ;
# the rules may have modified the build request, reconstruct it
properties = [ expand-build-request $(toolset) $(variant) $(target)
: $(properties[2-]) : $(build-request) ] ;
subvariants += $(target)|$(properties)|$(toolset)|$(variant) ;
}
}
}
return $(subvariants) ;
return [ unique $(subvariants) ] ;
}
# Given an expanded subvariant of a terget, sets the various variables accordingly.
@@ -2463,10 +2465,6 @@ rule force-NT-static-link ( pattern : toolset : subvariant-path properties * )
{
if $(NT) && [ MATCH $(pattern) : $(toolset) ]
{
local p = [ MATCH (.*)runtime-link-dynamic(.*) : $(subvariant-path) ] ;
subvariant-path = $(p[1])runtime-link-static$(p[2]) ;
properties =
[ difference $(properties) : <runtime-link>dynamic ]
<runtime-link>static