mirror of
https://github.com/boostorg/build.git
synced 2026-02-16 01:12:13 +00:00
Don't make singleton vars globally singular, as it interfears with toolset extension.
[SVN r19838]
This commit is contained in:
@@ -482,12 +482,12 @@ rule set-as-singleton ( variables + )
|
||||
for local variable in $(variables)
|
||||
{
|
||||
$(variable) = $($(variable):J=" ") ;
|
||||
if ! $(gSINGLETON_SET($(variable)))
|
||||
{
|
||||
gSINGLETON($(variable)) = $($(variable)) ;
|
||||
gSINGLETON_SET($(variable)) = true ;
|
||||
}
|
||||
$(variable) ?= $(gSINGLETON($(variable))) ;
|
||||
#~ if ! $(gSINGLETON_SET($(variable)))
|
||||
#~ {
|
||||
#~ gSINGLETON($(variable)) = $($(variable)) ;
|
||||
#~ gSINGLETON_SET($(variable)) = true ;
|
||||
#~ }
|
||||
#~ $(variable) ?= $(gSINGLETON($(variable))) ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -482,12 +482,12 @@ rule set-as-singleton ( variables + )
|
||||
for local variable in $(variables)
|
||||
{
|
||||
$(variable) = $($(variable):J=" ") ;
|
||||
if ! $(gSINGLETON_SET($(variable)))
|
||||
{
|
||||
gSINGLETON($(variable)) = $($(variable)) ;
|
||||
gSINGLETON_SET($(variable)) = true ;
|
||||
}
|
||||
$(variable) ?= $(gSINGLETON($(variable))) ;
|
||||
#~ if ! $(gSINGLETON_SET($(variable)))
|
||||
#~ {
|
||||
#~ gSINGLETON($(variable)) = $($(variable)) ;
|
||||
#~ gSINGLETON_SET($(variable)) = true ;
|
||||
#~ }
|
||||
#~ $(variable) ?= $(gSINGLETON($(variable))) ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user