X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flink.cpp;h=5cee28753405a5158cdf5abfa6d6fdf69fa00aee;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=2ff5a97e85060545194ab58b4832e219617bb542;hpb=57bdb055acb0453c75b22cb64f35cc0e817a2827;p=builder.git

diff --git a/source/link.cpp b/source/link.cpp
index 2ff5a97..5cee287 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -1,4 +1,5 @@
-#include <msp/path/utils.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
@@ -13,51 +14,52 @@
 using namespace std;
 using namespace Msp;
 
-Link::Link(Builder &b, const Executable &exe):
+Link::Link(Builder &b, const Binary &bin):
 	ExternalAction(b)
 {
-	const Component &comp=exe.get_component();
+	const Component &comp = bin.get_component();
 
-	const string &prefix=b.get_arch_prefix(exe.get_package()->get_arch());
+	work_dir = comp.get_package().get_source();
 
 	//XXX Determine whether to use g++ or gcc
-	argv.push_back(prefix+"g++");
-	
-	if(comp.get_type()==Component::LIBRARY)
+	string tool = "LXX";
+	argv.push_back(builder.get_current_arch().get_tool(tool));
+
+	if(comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE)
 		argv.push_back("-shared");
 	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)
 		argv.push_back("-L"+*i);
-	
+
 	argv.push_back("-o");
-	argv.push_back(exe.get_name());
-	const TargetList &deps=exe.get_depends();
+	argv.push_back(relative(bin.get_path(), work_dir).str());
+	const TargetList &deps = bin.get_depends();
 	for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 	{
-		Target *tgt=*i;
-		if(dynamic_cast<Install *>(tgt))
-			tgt=tgt->get_depends().front();
-
-		if(dynamic_cast<ObjectFile *>(tgt))
-			argv.push_back((*i)->get_name());
-		else if(SharedLibrary *shlib=dynamic_cast<SharedLibrary *>(tgt))
-			argv.push_back("-l"+shlib->get_libname());
-		else if(dynamic_cast<StaticLibrary *>(tgt))
-			argv.push_back((*i)->get_name());
-		else if(SystemLibrary *syslib=dynamic_cast<SystemLibrary *>(tgt))
-			argv.push_back("-l"+syslib->get_libname());
+		Target *tgt = (*i)->get_real_target();
+
+		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))
+			argv.push_back(stlib->get_path().str());
+		else if(Library *lib = dynamic_cast<Library *>(tgt))
+			argv.push_back("-l"+lib->get_libname());
 	}
 
-	Path::Path epath=exe.get_name();
+	FS::Path binpath = bin.get_path();
 	if(!builder.get_dry_run())
-		Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
+		FS::mkpath(FS::dirname(binpath), 0755);
 
-	announce(comp.get_package().get_name(), "LINK", relative(epath, comp.get_package().get_source()).str());
+	announce(comp.get_package().get_name(), tool, relative(binpath, work_dir).str().substr(2));
 
 	launch();
 }