mirror of
https://github.com/boostorg/build.git
synced 2026-02-17 01:32:12 +00:00
Bugfix.
* new/feature.jam
(expand-subfeatures): Don't try expanding subfeatures in subfeatures.
[SVN r17815]
This commit is contained in:
@@ -300,7 +300,15 @@ rule expand-subfeatures (
|
||||
local result ;
|
||||
for local p in $(properties)
|
||||
{
|
||||
result += [ expand-subfeatures-aux $(p:G) : $(p:G=) ] ;
|
||||
# Don't expand subfeatures in subfeatures
|
||||
if ! [ MATCH "(:)" : $(p:G) ]
|
||||
{
|
||||
result += [ expand-subfeatures-aux $(p:G) : $(p:G=) ] ;
|
||||
}
|
||||
else
|
||||
{
|
||||
result += $(p) ;
|
||||
}
|
||||
}
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
@@ -300,7 +300,15 @@ rule expand-subfeatures (
|
||||
local result ;
|
||||
for local p in $(properties)
|
||||
{
|
||||
result += [ expand-subfeatures-aux $(p:G) : $(p:G=) ] ;
|
||||
# Don't expand subfeatures in subfeatures
|
||||
if ! [ MATCH "(:)" : $(p:G) ]
|
||||
{
|
||||
result += [ expand-subfeatures-aux $(p:G) : $(p:G=) ] ;
|
||||
}
|
||||
else
|
||||
{
|
||||
result += $(p) ;
|
||||
}
|
||||
}
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user