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

Avoid reprocessing toolset.requirements.

Browse Source 
[SVN r83846]
This commit is contained in:
Steven Watanabe
2013-04-11 17:30:35 +00:00
parent f75b63a62b
commit b62fb9a607
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/build/targets.jam
View File

@@ -1593,8 +1593,6 @@ rule main-target-requirements (
: project # Project where the main target is to be declared.
)
{
specification += [ toolset.requirements ] ;
local requirements = [ property-set.refine-from-user-input
[ $(project).get requirements ] : $(specification) :
[ $(project).project-module ] : [ $(project).get location ] ] ;
@@ -1603,7 +1601,7 @@ rule main-target-requirements (
import errors ;
errors.error "Conflicting requirements for target:" $(requirements) ;
}
return $(requirements) ;
return [ $(requirements).add [ toolset.requirements ] ] ;
}

6
src/build/toolset.jam
View File

@@ -539,6 +539,7 @@ rule inherit-rules ( toolset : base : localize ? )
IMPORT $(toolset) : $(rules) : : $(toolset).$(rules) ;
}
.requirements = [ property-set.empty ] ;
# Return the list of global 'toolset requirements'. Those requirements will be
# automatically added to the requirements of any main target.
@@ -558,7 +559,10 @@ rule add-requirements ( requirements * )
{
if ! $(.ignore-requirements)
{
.requirements += $(requirements) ;
requirements = [ property.translate-indirect $(specification) : [ CALLER_MODULE ] ] ;
requirements = [ property.expand-subfeatures-in-conditions $(requirements) ] ;
requirements = [ property.make $(requirements) ] ;
.requirements = [ $(.requirements).add-raw $(requirements) ] ;
}
}