mirror of
https://github.com/boostorg/build.git
synced 2026-02-13 00:12:11 +00:00
When building searched libraries, return 'xdll-path' properties for each
'search' property. This makes sure that linking againsts searched library in custom directory works on gcc, and that proper run-time library search path is set by 'unit-test' and 'run' rule. [SVN r32342]
This commit is contained in:
@@ -495,18 +495,21 @@ class searched-lib-generator : generator
|
||||
{
|
||||
shared = true ;
|
||||
}
|
||||
|
||||
local search = [ feature.get-values <search> : $(properties) ] ;
|
||||
|
||||
a = [ new null-action $(property-set) ] ;
|
||||
local t = [ new searched-lib-target $(name) : $(project) : $(shared)
|
||||
: [ feature.get-values <name> : $(properties) ]
|
||||
: [ feature.get-values <search> : $(properties) ]
|
||||
: $(search)
|
||||
: $(a)
|
||||
] ;
|
||||
# We return sources for a simple reason. If there's
|
||||
# lib png : z : <name>png ;
|
||||
# the 'z' target should be returned, so that apps linking to
|
||||
# 'png' will link to 'z', too.
|
||||
return [ virtual-target.register $(t) ] $(sources) ;
|
||||
return [ property-set.create <xdll-path>$(search) ]
|
||||
[ virtual-target.register $(t) ] $(sources) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ class unix-searched-lib-generator : searched-lib-generator
|
||||
local result = [ searched-lib-generator.run $(project) $(name)
|
||||
: $(property-set) : $(sources) ] ;
|
||||
|
||||
unix.set-library-order $(sources) : $(property-set) : $(result) ;
|
||||
unix.set-library-order $(sources) : $(property-set) : $(result[2-]) ;
|
||||
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user