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

Subject: [Boost-commit] svn:boost r65242 - trunk/tools/build/v2/build
From: ghost_at_[hidden]
Date: 2010-09-04 08:29:11

Author: vladimir_prus
Date: 2010-09-04 08:29:10 EDT (Sat, 04 Sep 2010)
New Revision: 65242
URL: http://svn.boost.org/trac/boost/changeset/65242

Log:
Make toolset version relevant for configure checks.

Text files modified: 
   trunk/tools/build/v2/build/configure.jam |     5 ++++-                                   
   trunk/tools/build/v2/build/configure.py  |     3 +++                                     
   2 files changed, 7 insertions(+), 1 deletions(-)

Modified: trunk/tools/build/v2/build/configure.jam
==============================================================================
--- trunk/tools/build/v2/build/configure.jam	(original)
+++ trunk/tools/build/v2/build/configure.jam	2010-09-04 08:29:10 EDT (Sat, 04 Sep 2010)
@@ -191,7 +191,10 @@
     {
         # FIXME: this should not be hardcoded. Other checks might
         # want to consider different set of features as relevant.
-        local relevant = [ property.select <target-os> <toolset> <address-model> <architecture>
+        local toolset = [ property.select <toolset> : $(properties) ] ;
+        local toolset-version-property = "<toolset-$(toolset:G=):version>" ;
+        local relevant = [ property.select <target-os> <toolset> $(toolset-version-property)
+            <address-model> <architecture>
             : $(properties) ] ;
         local ps = [ property-set.create $(relevant) ] ;        
         local t = [ targets.current ] ;

Modified: trunk/tools/build/v2/build/configure.py
==============================================================================
--- trunk/tools/build/v2/build/configure.py	(original)
+++ trunk/tools/build/v2/build/configure.py	2010-09-04 08:29:10 EDT (Sat, 04 Sep 2010)
@@ -137,8 +137,11 @@
         
         # FIXME: this should not be hardcoded. Other checks might
         # want to consider different set of features as relevant.
+        toolset = ps.get('toolset')[0]
+        toolset_version_property = "<toolset-" + toolset + ":version>" ;
         relevant = ps.get_properties('target-os') + \
                    ps.get_properties("toolset") + \
+                   ps.get_properties(toolset_version_property) + \
                    ps.get_properties("address-model") + \
                    ps.get_properties("architecture")
         rps = property_set.create(relevant)