From ce51cddfb1f315f7c5db9ce0ab601bbc2b9b0ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= Date: Sat, 12 Jul 2008 11:43:54 +0000 Subject: [PATCH] Fixed a bug wit Boost Build ignoring conditional properties specified in addition to a conditional subfeature property. This fixes the problem with the conditionals_multiple.py test case failing. [SVN r47347] --- src/build/property.jam | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/build/property.jam b/src/build/property.jam index 714a89f3f..92b59673a 100644 --- a/src/build/property.jam +++ b/src/build/property.jam @@ -159,8 +159,7 @@ rule expand-subfeatures-in-conditions ( properties * ) } else { - local individual-subfeatures = [ set.difference $(e) : $(condition) ] ; - result += $(individual-subfeatures:J=,):$(value) ; + result += $(e:J=,):$(value) ; } } }