Delay locating tool executables until the tool is needed

[builder.git] / source / mingwdlltool.cpp

diff --git a/source/mingwdlltool.cpp b/source/mingwdlltool.cpp
index 5f62a02c954dadbcbc808b15b37d55938d90d812..f44f5754a1ef4f8d45ec639ff045716a9f7b830a 100644 (file)
--- a/source/mingwdlltool.cpp
+++ b/source/mingwdlltool.cpp
@@ -18,14 +18,9 @@ using namespace Msp;
 
 MingwDllTool::MingwDllTool(Builder &b, const Architecture &a):
        Tool(b, a, "DLL")
-{
-       string command = "dlltool";
-       if(architecture->is_cross())
-               command = format("%s-%s", architecture->get_cross_prefix(), command);
-       executable = builder.get_vfs().find_binary(command);
-}
+{ }
 
-Target *MingwDllTool::create_target(const list<Target *> &sources, const string &) const
+Target *MingwDllTool::create_target(const list<Target *> &sources, const string &)
 {
        if(sources.size()!=1)
                throw invalid_argument("MingwDllTool::create_target");
@@ -50,7 +45,7 @@ Target *MingwDllTool::create_install(Target &target) const
 {
        if(ImportLibrary *imp = dynamic_cast<ImportLibrary *>(&target))
        {
-               const Tool &copy = builder.get_toolchain().get_tool("CP");
+               Tool &copy = builder.get_toolchain().get_tool("CP");
                InstalledFile *inst_tgt = dynamic_cast<InstalledFile *>(copy.create_target(target));
                string link_name = format("lib%s.dll.a", imp->get_shared_library()->get_libname());
                if(link_name!=FS::basename(inst_tgt->get_path()))
@@ -61,6 +56,14 @@ Target *MingwDllTool::create_install(Target &target) const
                return 0;
 }
 
+void MingwDllTool::do_prepare()
+{
+       string command = "dlltool";
+       if(architecture->is_cross())
+               command = format("%s-%s", architecture->get_cross_prefix(), command);
+       executable = builder.get_vfs().find_binary(command);
+}
+
 Task *MingwDllTool::run(const Target &target) const
 {
        const ImportLibrary *imp = dynamic_cast<const ImportLibrary *>(&target);