X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.cpp;h=8aa75dcafd982646980871b59ff74c796d5a00ca;hb=c194bac9d508999c046a1f56c80b9419f77a8590;hp=1ab3660474cf57de3a31bcf47df6231370beff5e;hpb=722d53055cc78a7a7d9901d2b1fe23a2a33fb623;p=builder.git

diff --git a/source/tool.cpp b/source/tool.cpp
index 1ab3660..8aa75dc 100644
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -1,11 +1,26 @@
 #include <algorithm>
+#include <msp/strings/format.h>
+#include "architecture.h"
+#include "builder.h"
 #include "tool.h"
 
 using namespace std;
+using namespace Msp;
 
 Tool::Tool(Builder &b, const string &t):
 	builder(b),
-	tag(t)
+	architecture(0),
+	tag(t),
+	executable(0),
+	prepared(false)
+{ }
+
+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
@@ -18,13 +33,32 @@ bool Tool::accepts_suffix(const string &suffix, bool aux) const
 		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();
+}
+
+void Tool::set_executable(const string &command, bool cross)
+{
+	if(cross && architecture->is_cross())
+		return set_executable(format("%s-%s", architecture->get_cross_prefix(), command), false);
+
+	executable = builder.get_vfs().find_binary(command);
+	if(!executable)
+		problems.push_back(format("Can't find executable %s", command));
+}
+
 
 SubTool::SubTool(Tool &p):
 	Tool(p),