X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fgnulinker.cpp;h=61332b2452a3e39069d2f1084008fb199b838c7c;hb=5ccb12706ac217a7f0b07e4c73ca870bb70fabdf;hp=c592cc86cf1e7bd888eefa753957f5988bea2e0b;hpb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index c592cc8..61332b2 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()));
 	}
 }
 
@@ -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();
@@ -337,7 +337,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	{
 		if(compiler_tag=="CXX")
 		{
-			BuildInfo::LibModeMap::const_iterator i = binfo.libmodes.find("stdc++");
+			auto i = binfo.libmodes.find("stdc++");
 			if(i!=binfo.libmodes.end() && i->second<=BuildInfo::STATIC)
 				argv.push_back("-static-libstdc++");
 		}