Prepare early dependencies of a target before finding more

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 055abb56982203e6645873d10b428dae8e3e488f..dbdd950e4a3bd7570c920b6122b0ee3cfcecf3e2 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -13,12 +13,7 @@ using namespace Msp;
 
 Target::Target(Builder &b, const string &n):
        builder(b),
-       package(0),
-       component(0),
-       name(n),
-       tool(0),
-       state(INIT),
-       primary_target(0)
+       name(n)
 {
        builder.get_build_graph().add_target(this);
 }
@@ -127,6 +122,10 @@ void Target::prepare()
        }
 
        state = PREPARING;
+       /* Prepare existing dependencies early, because their information may be
+       needed to find other dependencies. */
+       for(Target *d: depends)
+               d->prepare();
        if(tool)
                tool->prepare();
 
@@ -145,6 +144,8 @@ void Target::prepare()
                broken |= (component && !component->get_problems().empty());
        }
 
+       /* Now that all dependencies are known, prepare them again.  This will do
+       nothing to already prepared targets. */
        for(Target *d: depends)
        {
                d->prepare();