X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmingwdlltool.cpp;h=03babd4126e09df7ff8869f5da214807094fb530;hb=407b96515a5246384847d1835a2d69704e941ea1;hp=5f62a02c954dadbcbc808b15b37d55938d90d812;hpb=a957405689fafa1afc233182a3756e36ea34281c;p=builder.git

diff --git a/source/mingwdlltool.cpp b/source/mingwdlltool.cpp
index 5f62a02..03babd4 100644
--- a/source/mingwdlltool.cpp
+++ b/source/mingwdlltool.cpp
@@ -1,7 +1,6 @@
 #include <cstdlib>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
-#include "architecture.h"
 #include "builder.h"
 #include "component.h"
 #include "exportdefinitions.h"
@@ -19,13 +18,10 @@ 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);
+	set_command("dlltool", true);
 }
 
-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 +46,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()))