X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=0d730a4a30f3a26dd3dc1e50b92f15db54481ef8;hb=bc6d4c540e7132c829dd558ca9d8acfbde7d71e1;hp=4048f1c5fefbe362b2dc0e358475cad70bd4b024;hpb=690b9c5f340504517cf6ba8aad0c168dcdff4efa;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 4048f1c..0d730a4 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -174,7 +174,7 @@ void GnuLinker::do_prepare()
 			}
 		}
 		else
-			system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/lib");
+			system_path.push_back(format("/usr/%s/lib", architecture->get_cross_prefix()));
 	}
 }
 
@@ -198,7 +198,7 @@ GnuLinker::Linker::Linker(GnuLinker &p, const string &ct):
 
 string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const
 {
-	string result = FS::basename(executable->get_path());
+	string result = Tool::create_build_signature(binfo);
 	result += ',';
 	if(binfo.libmode<=BuildInfo::STATIC)
 		result += 't';
@@ -232,7 +232,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
 {
 	const Binary &bin = dynamic_cast<const Binary &>(target);
 
-	vector<string> argv;
+	ExternalTask::Arguments argv;
 	argv.push_back(executable->get_path().str());
 
 	FS::Path work_dir = bin.get_component()->get_package().get_source_directory();