From 65ff7464a7a02f4d4a2fd297c9d79746bbc893e1 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Thu, 25 May 2006 07:59:36 +0000 Subject: [PATCH] Don't validate properties inside condition, because those properties might involve values that might not be defined, and features that are not defined. [SVN r34084] --- v2/build/property.jam | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/v2/build/property.jam b/v2/build/property.jam index b4c4169f9..3ad0cd340 100644 --- a/v2/build/property.jam +++ b/v2/build/property.jam @@ -139,19 +139,12 @@ rule expand-subfeatures-in-conditions ( properties * ) local e ; for local c in $(condition) { - if [ MATCH "^(|)" : $(c:G) ] || - [ MATCH "^()" : $(c:G) ] - { - # It common that condition includes a toolset which - # was never defined, or mentiones subfeatures which - # were never defined. In that case, validation will - # only produce an spirious error, so don't validate. - e += [ feature.expand-subfeatures $(c) : true ] ; - } - else - { - e += [ feature.expand-subfeatures $(c) ] ; - } + # It common that condition includes a toolset which + # was never defined, or mentiones subfeatures which + # were never defined. In that case, validation will + # only produce an spirious error, so prevent + # validation by passing 'true' as second parameter. + e += [ feature.expand-subfeatures $(c) : true ] ; } if $(e) = $(condition)