mirror of
https://github.com/boostorg/build.git
synced 2026-02-13 12:22:17 +00:00
* new/property.jam:
(refine): Ignore conditional properties. This reverts my previous change but makes the change more robust. [SVN r19923]
This commit is contained in:
@@ -29,8 +29,12 @@ rule refine ( properties * : requirements * )
|
||||
# Record them so that we can handle 'properties'.
|
||||
for local r in $(requirements)
|
||||
{
|
||||
# Note: cannot use local here, so take an ugly name
|
||||
__require__$(r:G) = $(r:G=) ;
|
||||
# Don't consider conditional requirements.
|
||||
if ! [ MATCH (:) : $(r:G=) ]
|
||||
{
|
||||
# Note: cannot use local here, so take an ugly name
|
||||
__require__$(r:G) = $(r:G=) ;
|
||||
}
|
||||
}
|
||||
|
||||
for local p in $(properties)
|
||||
@@ -500,6 +504,11 @@ local rule __test__ ( )
|
||||
: refine <toolset>gcc : <rtti>off <rtti>off:<define>FOO
|
||||
: $(test-space)
|
||||
;
|
||||
|
||||
assert.result <toolset>gcc:<define>foo <toolset>gcc:<define>bar
|
||||
: refine <toolset>gcc:<define>foo : <toolset>gcc:<define>bar
|
||||
: $(test-space)
|
||||
;
|
||||
|
||||
assert.result <toolset>gcc <variant>release <rtti>off <define>MY_RELEASE
|
||||
: evaluate-conditionals <toolset>gcc <variant>release <rtti>off
|
||||
|
||||
Reference in New Issue
Block a user