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

Make <hardcode-dll-paths>true the default.

Browse Source 
[SVN r25735]
This commit is contained in:
Vladimir Prus
2004-10-15 13:11:15 +00:00
parent f713da2a09
commit 6c802afcf2
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/builtin.jam
View File

@@ -88,7 +88,7 @@ feature search : : free path ; #order-sensitive ;
feature location : : free path ;
feature dll-path : : free path ;
feature hardcode-dll-paths : false true : incidental propagated ;
feature hardcode-dll-paths : true false : incidental ;
# This is internal feature which holds the paths of all dependency

21
src/tools/stage.jam
View File

@@ -126,7 +126,7 @@ class stage-target-class : basic-target
}
rule construct ( source-targets * : property-set )
{
{
local name = [ $(property-set).get <name> ] ;
if $(name) && $(source-targets[2])
{
@@ -278,7 +278,16 @@ class stage-exe-generator : generator
# stage can affect the relinking details.
local ps = [ $(action).properties ] ;
local new-ps = [ $(ps).add [ property-set.create [ $(property-set).free ] ] ] ;
local ps-raw = [ $(ps).raw ] ;
# Unless <hardcode-dll-paths>true is in properties, which can
# happen only if the user has explicitly requested it, nuke all
# <dll-path> properties.
if [ $(property-set).get <hardcode-dll-paths> ] != true
{
ps-raw = [ property.change $(ps-raw) : <dll-path> ] ;
}
ps-raw = $(ps-raw) [ $(property-set).free ] ;
local new-ps = [ property-set.create $(ps-raw) ] ;
local cloned-action = [ virtual-target.clone-action $(action) : $(project) :
"" : $(new-ps) ] ;
@@ -301,6 +310,14 @@ rule stage ( name : sources * : requirements * : default-build * )
{
local project = [ project.current ] ;
# Unless the user has explicitly asked us to hardcode dll paths, add
# <hardcode-dll-paths>false in requirements, to override default
# value.
if ! <hardcode-dll-paths>true in $(requirements)
{
requirements += <hardcode-dll-paths>false ;
}
targets.main-target-alternative
[ new stage-target-class $(name) : $(project)
: [ targets.main-target-sources $(sources) : $(name) ]