X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.cpp;h=3aa2db3c713716ba7d90bcafa715afe368a37302;hb=c75c89d2425ab0c69e94d45a5d956286838bbc67;hp=8aa75dcafd982646980871b59ff74c796d5a00ca;hpb=0d95fee118a3fcd78f153dca5721d9fe19b6f6bf;p=builder.git

diff --git a/source/tool.cpp b/source/tool.cpp
index 8aa75dc..3aa2db3 100644
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -23,6 +23,17 @@ Tool::Tool(Builder &b, const Architecture &a, const string &t):
 	prepared(false)
 { }
 
+void Tool::set_command(const string &cmd, bool cross)
+{
+	if(cmd.empty())
+		throw invalid_argument("Tool::set_command");
+
+	if(cross && architecture->is_cross() && !FS::Path(cmd).is_absolute())
+		command = format("%s-%s", architecture->get_cross_prefix(), cmd);
+	else
+		command = cmd;
+}
+
 bool Tool::accepts_suffix(const string &suffix, bool aux) const
 {
 	if(find(input_suffixes.begin(), input_suffixes.end(), suffix)!=input_suffixes.end())
@@ -47,16 +58,12 @@ void Tool::prepare()
 
 	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));
+	if(!executable && !command.empty())
+	{
+		executable = builder.get_vfs().find_binary(command);
+		if(!executable)
+			problems.push_back(format("Can't find executable %s", command));
+	}
 }