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

Record proper order dependencies even for seached libraries, to automatically

Browse Source 
compute the right order on the link line.


[SVN r24700]
This commit is contained in:
Vladimir Prus
2004-08-24 08:25:43 +00:00
parent 8f92dac4b1
commit b23ee8e6d3
1 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
v2/tools/unix.jam
View File

@@ -14,6 +14,7 @@ import generators ;
import type ;
import set ;
import order ;
import builtin ;
class unix-linking-generator : linking-generator
{
@@ -92,6 +93,32 @@ class unix-archive-generator : generator
}
}
class unix-searched-lib-generator : searched-lib-generator
{
import unix ;
rule __init__ ( * : * )
{
generator.__init__
$(1) : $(2) : $(3) : $(4) : $(5) : $(6) : $(7) : $(8) : $(9) ;
}
rule optional-properties ( )
{
return $(self.requirements) ;
}
rule run ( project name ? : property-set : sources * : multiple ? )
{
local result = [ searched-lib-generator.run $(project) $(name)
: $(property-set) : $(sources) : $(multiple) ] ;
unix.set-library-order $(sources) : $(property-set) : $(result) ;
return $(result) ;
}
}
# Declare generators
generators.register [ new unix-linking-generator unix.link : LIB OBJ : EXE
@@ -103,6 +130,9 @@ generators.register [ new unix-archive-generator unix.archive : OBJ : STATIC_LIB
generators.register [ new unix-linking-generator unix.link.dll : LIB OBJ : SHARED_LIB
: <toolset>unix ] ;
generators.register [ new unix-searched-lib-generator
unix.searched-lib-generator : : SEARCHED_LIB : <toolset>unix ] ;
# The derived toolset must specify their own actions.
actions link {
@@ -114,6 +144,10 @@ actions link.dll {
actions archive {
}
actions searched-lib-generator {
}
.order = [ new order ] ;
@@ -158,6 +192,7 @@ rule set-library-order ( sources * : property-set : result * )
rule order-libraries ( libraries * )
{
return [ $(.order).order $(libraries) ] ;
local r = [ $(.order).order $(libraries) ] ;
return $(r) ;
}