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

Subject: [Boost-commit] svn:boost r64287 - trunk/tools/build/v2/build
From: ghost_at_[hidden]
Date: 2010-07-23 05:38:54

Author: vladimir_prus
Date: 2010-07-23 05:38:49 EDT (Fri, 23 Jul 2010)
New Revision: 64287
URL: http://svn.boost.org/trac/boost/changeset/64287

Log:
Fix flag setting
Text files modified: 
   trunk/tools/build/v2/build/toolset.py        |     6 +++---                                  
   trunk/tools/build/v2/build/virtual_target.py |     1 +                                       
   2 files changed, 4 insertions(+), 3 deletions(-)

Modified: trunk/tools/build/v2/build/toolset.py
==============================================================================
--- trunk/tools/build/v2/build/toolset.py	(original)
+++ trunk/tools/build/v2/build/toolset.py	2010-07-23 05:38:49 EDT (Fri, 23 Jul 2010)
@@ -310,7 +310,7 @@
     
     if get_grist (value):
         f = feature.get(value)
-        properties = ps.get(feature)
+        properties = ps.get(f)
         
         for p in properties:
 
@@ -329,8 +329,8 @@
                 # specially -- each &&-separated element is considered
                 # separate value. This is needed to handle searched
                 # libraries, which must be in specific order.
-                if not __re_two_ampersands.search (ungristed):
-                    values.append (ungristed)
+                if not __re_two_ampersands.search(value):
+                    values.append(value)
 
                 else:
                     values.extend(value.split ('&&'))

Modified: trunk/tools/build/v2/build/virtual_target.py
==============================================================================
--- trunk/tools/build/v2/build/virtual_target.py	(original)
+++ trunk/tools/build/v2/build/virtual_target.py	2010-07-23 05:38:49 EDT (Fri, 23 Jul 2010)
@@ -746,6 +746,7 @@
 
         ps = self.properties ()
         properties = self.adjust_properties (ps)
+
         actual_targets = []
         
         for i in self.targets ():