Delay locating tool executables until the tool is needed

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index e1858493add33c2624f78cd0585235d7603c03a1..a23de6322e8ad3fef1422531d8577944b18000de 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -5,17 +5,48 @@ using namespace std;
 
 Tool::Tool(Builder &b, const string &t):
        builder(b),
-       tag(t)
+       architecture(0),
+       tag(t),
+       executable(0),
+       prepared(false)
 { }
 
-bool Tool::accepts_suffix(const string &suffix) const
+Tool::Tool(Builder &b, const Architecture &a, const string &t):
+       builder(b),
+       architecture(&a),
+       tag(t),
+       executable(0),
+       prepared(false)
+{ }
+
+bool Tool::accepts_suffix(const string &suffix, bool aux) const
 {
-       return find(input_suffixes.begin(), input_suffixes.end(), suffix)!=input_suffixes.end();
+       if(find(input_suffixes.begin(), input_suffixes.end(), suffix)!=input_suffixes.end())
+               return true;
+       else if(aux)
+               return find(aux_suffixes.begin(), aux_suffixes.end(), suffix)!=aux_suffixes.end();
+       else
+               return false;
 }
 
-Target *Tool::create_target(Target &source, const string &arg) const
+Target *Tool::create_target(Target &source, const string &arg)
 {
        list<Target *> sources;
        sources.push_back(&source);
        return create_target(sources, arg);
 }
+
+void Tool::prepare()
+{
+       if(prepared)
+               return;
+
+       prepared = true;
+       do_prepare();
+}
+
+
+SubTool::SubTool(Tool &p):
+       Tool(p),
+       parent(p)
+{ }