Subject: [Boost-commit] svn:boost r78244 - trunk/tools/build/v2/engine
Date: 2012-04-28 13:39:07
Date: 2012-04-28 13:39:06 EDT (Sat, 28 Apr 2012)
New Revision: 78244
make sure that we don't call make0 twice on the original include node.
Text files modified:
trunk/tools/build/v2/engine/make1.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
--- trunk/tools/build/v2/engine/make1.c (original)
+++ trunk/tools/build/v2/engine/make1.c 2012-04-28 13:39:06 EDT (Sat, 28 Apr 2012)
@@ -608,10 +608,6 @@
if ( target_to_rescan->includes )
- /* Link the old includes on to make sure that it gets
- * cleaned up correctly.
- target_to_rescan->includes->includes = saved_includes;
target_to_rescan->includes->rescanned = 1;
/* Tricky. The parents have already been processed, but they
* have not seen the internal node, because it was just
@@ -624,6 +620,10 @@
* built before this make1a() processing has even started.
make0( target_to_rescan->includes, target_to_rescan->parents->target, 0, 0, 0 );
+ /* Link the old includes on to make sure that it gets
+ * cleaned up correctly.
+ target_to_rescan->includes->includes = saved_includes;
for ( c = target_to_rescan->parents; c; c = c->next )
c->target->depends = targetentry( c->target->depends,
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk