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

Properly hardcode dll paths, even if library was not produced by 'lib' target,

Browse Source 
but was specified as file.


[SVN r22963]
This commit is contained in:
Vladimir Prus
2004-05-28 08:46:49 +00:00
parent 765486f506
commit e4163c3201
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
v2/tools/builtin.jam
View File

@@ -606,6 +606,9 @@ IMPORT $(__name__) : register-c-compiler : : generators.register-c-compiler ;
class linking-generator : generator
{
import property-set ;
import type ;
import path ;
import project ;
rule __init__ ( id
composing ? : # Specify if generator is composing. The generator will be
@@ -625,10 +628,27 @@ class linking-generator : generator
if [ $(property-set).get <hardcode-dll-paths> ] = true
{
local xdll-path = [ $(property-set).get <xdll-path> ] ;
# It's possible that we have libraries in sources which did not came
# from 'lib' target. For example, libraries which are specified
# just as filenames as sources. We don't have xdll-path properties
# for such target, but still need to add proper dll-path properties.
for local s in $(sources)
{
if [ type.is-derived [ $(s).type ] SHARED_LIB ] && ! [ $(s).action ]
{
# Unfortunately, we don't have a good way to find the path
# to a file, so use this nasty approach.
local location = [ path.root [ $(s).name ]
[ project.attribute [ $(s).project ] source-location ] ] ;
xdll-path += [ path.parent $(location) ] ;
}
}
if $(xdll-path)
{
property-set = [ $(property-set).add-raw $(xdll-path:G=<dll-path>) ] ;
}
}
local result = [ generator.run $(project) $(name) : $(property-set)