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

Remove code duplication. Optimize library ordering by not ordering sources

Browse Source 
which are not of LIB type.


[SVN r22280]
This commit is contained in:
Vladimir Prus
2004-02-16 07:25:23 +00:00
parent e75666d6a3
commit f641d2ca34
1 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/tools/gcc.jam
View File

@@ -14,6 +14,7 @@ import type ;
import feature ;
import "class" : new ;
import order ;
import set ;
feature.extend toolset : gcc ;
feature.subfeature toolset gcc : version : : optional propagated link-incompatible ;
@@ -76,37 +77,31 @@ class gcc-linking-generator : linking-generator
rule run ( project name ? : property-set : sources + : multiple ? )
{
local used-libraries ;
local deps = [ $(property-set).dependency ] ;
for local l in $(sources) $(deps:G=)
{
if [ $(l).type ] && [ type.is-derived [ $(l).type ] LIB ]
{
used-libraries += $(l) ;
}
}
local result = [ linking-generator.run $(project) $(name) : $(property-set)
: $(sources) : $(multiple) ] ;
local created-libraries ;
for local l in $(result)
{
if [ type.is-derived [ $(l).type ] LIB ]
{
created-libraries += $(l) ;
}
}
created-libraries = [ set.difference $(created-libraries) : $(used-libraries) ] ;
gcc.set-library-order $(created-libraries) : $(used-libraries) ;
gcc.set-library-order $(sources) : $(property-set) : $(result) ;
return $(result) ;
}
rule generated-targets ( sources + : property-set : project name ? )
{
sources = [ gcc.order-libraries $(sources) ] ;
local sources2 ;
local libraries ;
for local l in $(sources)
{
if [ type.is-derived [ $(l).type ] LIB ]
{
libraries += $(l) ;
}
else
{
sources2 += $(l) ;
}
}
sources = $(sources2) [ gcc.order-libraries $(libraries) ] ;
return [ linking-generator.generated-targets $(sources) : $(property-set)
: $(project) $(name) ] ;
@@ -127,33 +122,12 @@ class gcc-archive-generator : generator
}
rule run ( project name ? : property-set : sources + : multiple ? )
{
local used-libraries ;
local deps = [ $(property-set).dependency ] ;
for local l in $(sources) $(deps:G=)
{
if [ type.is-derived [ $(l).type ] LIB ]
{
used-libraries += $(l) ;
}
}
{
local result = [ generator.run $(project) $(name) : $(property-set)
: $(sources) : $(multiple) ] ;
local created-libraries ;
for local l in $(result)
{
if [ type.is-derived [ $(l).type ] LIB ]
{
created-libraries += $(l) ;
}
}
created-libraries = [ set.difference $(created-libraries) : $(used-libraries) ] ;
gcc.set-library-order $(created-libraries) : $(used-libraries) ;
gcc.set-library-order $(sources) : $(property-set) : $(result) ;
return $(result) ;
}
@@ -309,7 +283,7 @@ else if [ modules.peek : UNIX ]
.order = [ new order ] ;
rule set-library-order ( from * : to * )
rule set-library-order-aux ( from * : to * )
{
for local f in $(from)
{
@@ -323,6 +297,34 @@ rule set-library-order ( from * : to * )
}
}
rule set-library-order ( sources * : property-set : result * )
{
local used-libraries ;
local deps = [ $(property-set).dependency ] ;
for local l in $(sources) $(deps:G=)
{
if [ $(l).type ] && [ type.is-derived [ $(l).type ] LIB ]
{
used-libraries += $(l) ;
}
}
local created-libraries ;
for local l in $(result)
{
if [ $(l).type ] && [ type.is-derived [ $(l).type ] LIB ]
{
created-libraries += $(l) ;
}
}
created-libraries = [ set.difference $(created-libraries) : $(used-libraries) ] ;
set-library-order-aux $(created-libraries) : $(used-libraries) ;
}
rule order-libraries ( libraries * )
{
return [ $(.order).order $(libraries) ] ;