From c23a6069ea0f67e9e7b2cbdf8ce4a92b585070cb Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 17 Mar 2003 07:58:06 +0000 Subject: [PATCH] =?UTF-8?q?Bufgix.=20Thanks=20to=20J=C3=BCrgen=20Hunold=20?= =?UTF-8?q?for=20the=20report.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * new/toolset.jam (set-target-variable): Call 'path.native' when setting path features. [SVN r17953] --- new/toolset.jam | 9 +++++++-- v2/build/toolset.jam | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/new/toolset.jam b/new/toolset.jam index 6c24978c7..d27041819 100644 --- a/new/toolset.jam +++ b/new/toolset.jam @@ -177,13 +177,18 @@ rule set-target-variables ( rule-or-module targets + : properties * ) local matches = [ property.select $(condition) : $(properties) ] ; for local p in $(matches) { - if dependency in [ feature.attributes $(p:G) ] + local att = [ feature.attributes $(p:G) ] ; + if dependency in $(att) { # the value of a dependency feature is a target # and must be actualized result += [ $(p:G=).actualize ] ; } - else + else if path in $(att) + { + result += [ path.native $(p:G=) ] ; + } + else { result += $(p:G=) ; } diff --git a/v2/build/toolset.jam b/v2/build/toolset.jam index 6c24978c7..d27041819 100644 --- a/v2/build/toolset.jam +++ b/v2/build/toolset.jam @@ -177,13 +177,18 @@ rule set-target-variables ( rule-or-module targets + : properties * ) local matches = [ property.select $(condition) : $(properties) ] ; for local p in $(matches) { - if dependency in [ feature.attributes $(p:G) ] + local att = [ feature.attributes $(p:G) ] ; + if dependency in $(att) { # the value of a dependency feature is a target # and must be actualized result += [ $(p:G=).actualize ] ; } - else + else if path in $(att) + { + result += [ path.native $(p:G=) ] ; + } + else { result += $(p:G=) ; }