From 0c2e75b80b682ba4e79eb0ab61eedb77f40d402b Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Fri, 5 Aug 2005 09:43:15 +0000
Subject: [PATCH] Cleanup toolset.using. We tries to conditionally call 'init',
 which both unnecessary, and incorretly coded.

Thanks for Craig Rodrigues for spotting it.


[SVN r30478]
---
 v2/build/project.jam | 16 +---------------
 v2/build/toolset.jam |  6 +-----
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/v2/build/project.jam b/v2/build/project.jam
index 46f383de7..900f23d71 100644
--- a/v2/build/project.jam
+++ b/v2/build/project.jam
@@ -714,20 +714,6 @@ rule use ( id : location )
     .current-project = $(saved-project) ;
 }
 
-
-# Initializes an additional toolset-like module.
-# First load 'toolset-module' and then calls its 'init'
-# rule with trailing arguments
-rule _using ( toolset-module : * )
-{
-    import $(toolset-module) ;
-    if ! $(.$(toolset-module)-init-callled)
-    {        
-        $(toolset-module)-init-callled = true ;
-        $(toolset-module).init $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
-    }    
-}
-
 # This module defines rules common to all projects
 module project-rules
 {                
@@ -745,7 +731,7 @@ module project-rules
         local x = [ modules.peek : BOOST_BUILD_PATH ] ;
         local caller = [ modules.binding $(__name__) ] ;
         modules.poke : BOOST_BUILD_PATH : $(caller:D) $(x) ;
-        project._using $(1) : $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
+        toolset.using $(1) : $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
         modules.poke : BOOST_BUILD_PATH : $(x) ;
         
         # The above might have clobbered .current-project
diff --git a/v2/build/toolset.jam b/v2/build/toolset.jam
index 22e5c9970..fc1c334d7 100644
--- a/v2/build/toolset.jam
+++ b/v2/build/toolset.jam
@@ -23,11 +23,7 @@ import sequence ;
 rule using ( toolset-module : * )
 {
     import $(toolset-module) ;
-    if ! $(.$(toolset-module)-init-callled)
-    {        
-        $(toolset-module)-init-callled = true ;
-        $(toolset-module).init $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
-    }    
+    $(toolset-module).init $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
 }
 
 # Expands subfeatures in each property sets.