From 77a5c8447d070b54bb1ca591bc7db444a6388134 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Thu, 4 Sep 2003 11:51:29 +0000 Subject: [PATCH] * new/property.jam (refine): Remove some wierd code. We used to ignore all requirement with ":" in them. Maybe this used to handle conditional requirements, but all tests pass without this logic. The problem was that intel in requirements was just *added* to properties, not replacing previous value. [SVN r19916] --- new/property.jam | 7 ++----- v2/build/property.jam | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/new/property.jam b/new/property.jam index ab52bf1cf..75b929343 100644 --- a/new/property.jam +++ b/new/property.jam @@ -29,11 +29,8 @@ rule refine ( properties * : requirements * ) # Record them so that we can handle 'properties'. for local r in $(requirements) { - if ! [ MATCH (:) : $(r) ] - { - # Note: cannot use local here, so take an ugly name - __require__$(r:G) = $(r:G=) ; - } + # Note: cannot use local here, so take an ugly name + __require__$(r:G) = $(r:G=) ; } for local p in $(properties) diff --git a/v2/build/property.jam b/v2/build/property.jam index ab52bf1cf..75b929343 100644 --- a/v2/build/property.jam +++ b/v2/build/property.jam @@ -29,11 +29,8 @@ rule refine ( properties * : requirements * ) # Record them so that we can handle 'properties'. for local r in $(requirements) { - if ! [ MATCH (:) : $(r) ] - { - # Note: cannot use local here, so take an ugly name - __require__$(r:G) = $(r:G=) ; - } + # Note: cannot use local here, so take an ugly name + __require__$(r:G) = $(r:G=) ; } for local p in $(properties)