From 3f5b1318c7f8582fc40819c39b24a67101d64d9c Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Wed, 8 Feb 2006 09:43:59 +0000 Subject: [PATCH] Ouch, my last 'make' changes broke setting flags on module. [SVN r32725] --- v2/build/toolset.jam | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/v2/build/toolset.jam b/v2/build/toolset.jam index 8b29a1c47..7e483a7be 100644 --- a/v2/build/toolset.jam +++ b/v2/build/toolset.jam @@ -87,9 +87,14 @@ rule flags ( rule-or-module # If contains dot, should be a rule name. { local caller = [ CALLER_MODULE ] ; if ! [ MATCH ".*([.]).*" : $(rule-or-module) ] + && [ MATCH "(Jamfile<.*)" : $(caller) ] { - # Unqualified rule name, qualify + # Unqualified rule name, used inside Jamfile. # (most likely used with 'make' or 'notfile' rules. + # This prevents setting flags on entire Jamfile module + # (this will be considered as rule), but who cares? + # Probably, 'flags' rule should be split into 'flags' and + # 'flags-on-module'. rule-or-module = $(caller).$(rule-or-module) ; } else