Don't complain about missing executable if a tool has no command

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index 852fa2d5805b294b4d74b5a5ab165039b08feaad..28523f677e57bd697d9b2b85ad39d9bcb9461747 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -20,6 +20,11 @@ void Tool::set_command(const string &cmd, bool cross)
                command = cmd;
 }
 
+void Tool::set_run(function<Task *(const Target &)> f)
+{
+       run_func = move(f);
+}
+
 bool Tool::accepts_suffix(const string &suffix, bool aux) const
 {
        return (any_equals(input_suffixes, suffix) || (aux && any_equals(aux_suffixes, suffix)));
@@ -38,15 +43,13 @@ void Tool::prepare()
                return;
 
        prepared = true;
+       if(!command.empty())
+               executable = builder.get_vfs().find_binary(command);
        do_prepare();
-       if(!executable && !command.empty())
+       if(!command.empty() && !executable)
        {
-               executable = builder.get_vfs().find_binary(command);
-               if(!executable)
-               {
-                       builder.get_logger().log("problems", "Can't find executable %s for %s", command, tag);
-                       problems.push_back(format("Can't find executable %s", command));
-               }
+               builder.get_logger().log("problems", "Can't find executable %s for %s", command, tag);
+               problems.push_back(format("Can't find executable %s", command));
        }
 }