boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup toolset.using. We tries to conditionally call 'init',

Browse Source 
which both unnecessary, and incorretly coded.

Thanks for Craig Rodrigues for spotting it.


[SVN r30478]
This commit is contained in:
Vladimir Prus
2005-08-05 09:43:15 +00:00
parent ba866fef5a
commit 0c2e75b80b
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
v2/build/project.jam
View File

@@ -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

6
v2/build/toolset.jam
View File

@@ -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.