X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=ddad8d1904abb06fb7252128b7bd586593599a81;hb=45dd0aa6e8f2107f1bd7d37fe4b171ee2259af60;hp=51da81f923cba4d649b181ee28cf68a01104b651;hpb=bc85cc286c8a3f1055f1979a7ff8697cf1b61912;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 51da81f..ddad8d1 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -45,16 +45,12 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const string &ar
 		throw invalid_argument("GnuLinker::create_target");
 	list<ObjectFile *> objs;
 	Linker *linker = default_linker;
-	for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+	for(Target *s: sources)
 	{
-		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
-		{
-			objs.push_back(obj);
-			if(obj->get_tool()->get_tag()=="CXX")
-				linker = cxx_linker;
-		}
-		else
-			throw invalid_argument("GnuLinker::create_target");
+		ObjectFile &obj = dynamic_cast<ObjectFile &>(*s);
+		objs.push_back(&obj);
+		if(obj.get_tool()->get_tag()=="CXX")
+			linker = cxx_linker;
 	}
 
 	const Component &comp = *objs.front()->get_component();
@@ -85,8 +81,7 @@ Target *GnuLinker::create_install(Target &target) const
 			builder.get_build_graph().add_installed_target(*shlib->get_import_library());
 		else
 		{
-			const Pattern &pattern = architecture->get_shared_library_patterns().front();
-			string link_name = pattern.apply(shlib->get_libname());
+			string link_name = architecture->create_filename<SharedLibrary>(shlib->get_libname());
 			if(link_name!=FS::basename(inst_tgt->get_path()))
 				inst_tgt->set_symlink(link_name);
 		}
@@ -175,7 +170,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()));
 	}
 }
 
@@ -199,7 +194,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';
@@ -233,7 +228,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();
@@ -281,8 +276,8 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		argv.push_back("-Wl,-rpath-link,"+lib_dir.str());
 	}
 
-	for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
-		argv.push_back("-L"+i->str());
+	for(const FS::Path &p: binfo.libpath)
+		argv.push_back("-L"+p.str());
 	if(binfo.strip)
 		argv.push_back("-s");
 	if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin")
@@ -295,19 +290,15 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	argv.push_back("-o");
 	argv.push_back(relative(bin.get_path(), work_dir).str());
 
-	for(BuildInfo::WordList::const_iterator i=binfo.keep_symbols.begin(); i!=binfo.keep_symbols.end(); ++i)
-		argv.push_back("-u"+*i);
+	for(const string &s: binfo.keep_symbols)
+		argv.push_back("-u"+s);
 
 	bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC);
 
-	if(architecture->get_system()=="windows" && architecture->get_cross_prefix().find("mingw")!=string::npos)
-		argv.push_back("-lmingw32");
-
-	const Target::Dependencies &depends = target.get_dependencies();
-	for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+	for(Target *d: target.get_dependencies())
 	{
-		FileTarget *file = dynamic_cast<FileTarget *>(*i);
-		Target *tgt = (*i)->get_real_target();
+		FileTarget *file = dynamic_cast<FileTarget *>(d);
+		Target *tgt = d->get_real_target();
 
 		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
 			argv.push_back(relative(obj->get_path(), work_dir).str());
@@ -329,11 +320,11 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		}
 	}
 
-	for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-		if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework"))
+	for(const string &l: binfo.libs)
+		if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework"))
 		{
 			argv.push_back("-framework");
-			argv.push_back(i->substr(0, i->size()-10));
+			argv.push_back(l.substr(0, l.size()-10));
 		}
 
 	if(static_link_ok)
@@ -342,7 +333,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++");
 		}