[Boost-commit] svn:boost r83846 - trunk/tools/build/v2/build

Subject: [Boost-commit] svn:boost r83846 - trunk/tools/build/v2/build
From: steven_at_[hidden]
Date: 2013-04-11 13:30:36

Author: steven_watanabe
Date: 2013-04-11 13:30:35 EDT (Thu, 11 Apr 2013)
New Revision: 83846
URL: http://svn.boost.org/trac/boost/changeset/83846

Log:
Avoid reprocessing toolset.requirements.
Text files modified: 
   trunk/tools/build/v2/build/targets.jam |     4 +---                                    
   trunk/tools/build/v2/build/toolset.jam |     6 +++++-                                  
   2 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/tools/build/v2/build/targets.jam
==============================================================================
--- trunk/tools/build/v2/build/targets.jam	(original)
+++ trunk/tools/build/v2/build/targets.jam	2013-04-11 13:30:35 EDT (Thu, 11 Apr 2013)
@@ -1593,8 +1593,6 @@
     : 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 @@
         import errors ;
         errors.error "Conflicting requirements for target:" $(requirements) ;
     }
-    return $(requirements) ;
+    return [ $(requirements).add [ toolset.requirements ] ] ;
 }
 
 

Modified: trunk/tools/build/v2/build/toolset.jam
==============================================================================
--- trunk/tools/build/v2/build/toolset.jam	(original)
+++ trunk/tools/build/v2/build/toolset.jam	2013-04-11 13:30:35 EDT (Thu, 11 Apr 2013)
@@ -539,6 +539,7 @@
     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 @@
 {
     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) ] ;
     }
 }