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

Revert mistaken commit

Browse Source 
[SVN r38920]
This commit is contained in:
Vladimir Prus
2007-08-25 04:36:02 +00:00
parent cdc5204212
commit 56b84b3330
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
v2/tools/builtin.jam
View File

@@ -333,28 +333,31 @@ class searched-lib-target : abstract-file-target
rule __init__ ( name
: project
: shared ?
: real-name ?
: search *
: action
)
{
abstract-file-target.__init__ $(name) exact : SEARCHED_LIB : $(project)
: $(action) : ;
local rn = [ apply-tag $(name) : [ tag-properties ] ] ;
if $(rn)
{
self.name = $(rn) ;
}
abstract-file-target.__init__ $(name) : SEARCHED_LIB : $(project)
: $(action) ;
self.shared = $(shared) ;
self.real-name = $(real-name) ;
self.real-name ?= $(name) ;
self.search = $(search) ;
}
rule shared ( )
{
return $(self.shared) ;
}
rule real-name ( )
{
return $(self.real-name) ;
}
rule search ( )
{
return $(self.search) ;
@@ -575,8 +578,8 @@ class searched-lib-generator : generator
local search = [ feature.get-values <search> : $(properties) ] ;
a = [ new null-action $(property-set) ] ;
local lib-name = [ feature.get-values <name> : $(properties) ] ;
local t = [ new searched-lib-target $(lib-name) : $(project) : $(shared)
local t = [ new searched-lib-target $(name) : $(project) : $(shared)
: [ feature.get-values <name> : $(properties) ]
: $(search)
: $(a)
] ;
@@ -806,7 +809,7 @@ class linking-generator : generator
{
if [ type.is-derived [ $(s).type ] SEARCHED_LIB ]
{
local name = [ $(s).name ] ;
local name = [ $(s).real-name ] ;
if [ $(s).shared ]
{
fsa += $(name) ;