X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flink.cpp;h=b6537d987a143e9551d893680be91f8eb29f08c8;hb=04c316da6d5d90e43cba262f54d90ca231f703bf;hp=88ee97a8595e1c5668f2e712b150ae6c895271ac;hpb=329dc80e392faf7354338621e73dba1880fc767d;p=builder.git

diff --git a/source/link.cpp b/source/link.cpp
index 88ee97a..b6537d9 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -1,11 +1,12 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/path/utils.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
@@ -20,50 +21,50 @@ Distributed under the LGPL
 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();
+
+	work_dir = comp.get_package().get_source();
 
 	//XXX Determine whether to use g++ or gcc
-	string tool="LXX";
-	argv.push_back(builder.get_architecture(comp.get_package().get_arch()).get_tool(tool));
+	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();
+	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();
+		Target *tgt = *i;
+		if(Install *inst = dynamic_cast<Install *>(tgt))
+			tgt = &inst->get_source();
 
-		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());
+		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(), tool, relative(epath, comp.get_package().get_source()).str());
+	announce(comp.get_package().get_name(), tool, relative(binpath, work_dir).str().substr(2));
 
 	launch();
 }