X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flink.cpp;h=b3e5152204b73d632478fe91a979a200e5f86b12;hb=f4a10e1dc189f28367eafe3b91723d275928ced7;hp=69a1d4048329562aa56029c86eb2c44cbb7ab56c;hpb=e68e95f8a44150e69d2f4b74995a12013dfe75aa;p=builder.git

diff --git a/source/link.cpp b/source/link.cpp
index 69a1d40..b3e5152 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -24,12 +24,12 @@ using namespace Msp;
 Link::Link(Builder &b, const Binary &bin):
 	ExternalAction(b)
 {
-	const Component &comp=bin.get_component();
+	const Component &comp = bin.get_component();
 
-	work_dir=comp.get_package().get_source();
+	work_dir = comp.get_package().get_source();
 
 	//XXX Determine whether to use g++ or gcc
-	string tool="LXX";
+	string tool = "LXX";
 	argv.push_back(builder.get_current_arch().get_tool(tool));
 
 	if(comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE)
@@ -37,7 +37,11 @@ Link::Link(Builder &b, const Binary &bin):
 	else if(comp.get_package().get_library_mode()==ALL_STATIC)
 		argv.push_back("-static");
 
-	const BuildInfo &binfo=comp.get_build_info();
+	if(const SharedLibrary *lib = dynamic_cast<const SharedLibrary *>(&bin))
+		if(!lib->get_soname().empty())
+			argv.push_back("-Wl,-soname,"+lib->get_soname());
+
+	const BuildInfo &binfo = comp.get_build_info();
 	for(list<string>::const_iterator i=binfo.ldflags.begin(); i!=binfo.ldflags.end(); ++i)
 		argv.push_back(*i);
 	for(list<string>::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
@@ -45,22 +49,20 @@ Link::Link(Builder &b, const Binary &bin):
 
 	argv.push_back("-o");
 	argv.push_back(relative(bin.get_path(), work_dir).str());
-	const TargetList &deps=bin.get_depends();
+	const TargetList &deps = bin.get_depends();
 	for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 	{
-		Target *tgt=*i;
-		if(Install *inst=dynamic_cast<Install *>(tgt))
-			tgt=&inst->get_source();
+		Target *tgt = (*i)->get_real_target();
 
-		if(ObjectFile *obj=dynamic_cast<ObjectFile *>(tgt))
+		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
 			argv.push_back(relative(obj->get_path(), work_dir).str());
-		else if(StaticLibrary *stlib=dynamic_cast<StaticLibrary *>(tgt))
+		else if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(tgt))
 			argv.push_back(stlib->get_path().str());
-		else if(Library *lib=dynamic_cast<Library *>(tgt))
+		else if(Library *lib = dynamic_cast<Library *>(tgt))
 			argv.push_back("-l"+lib->get_libname());
 	}
 
-	FS::Path binpath=bin.get_path();
+	FS::Path binpath = bin.get_path();
 	if(!builder.get_dry_run())
 		FS::mkpath(FS::dirname(binpath), 0755);