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

diff --git a/source/link.cpp b/source/link.cpp
index 2ff5a97..95dfaa6 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -1,4 +1,12 @@
-#include <msp/path/utils.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <msp/fs/dir.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
@@ -18,12 +26,13 @@ Link::Link(Builder &b, const Executable &exe):
 {
 	const Component &comp=exe.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");
@@ -33,9 +42,9 @@ Link::Link(Builder &b, const Executable &exe):
 		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());
+	argv.push_back(relative(exe.get_name(), work_dir).str());
 	const TargetList &deps=exe.get_depends();
 	for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 	{
@@ -44,7 +53,7 @@ Link::Link(Builder &b, const Executable &exe):
 			tgt=tgt->get_depends().front();
 
 		if(dynamic_cast<ObjectFile *>(tgt))
-			argv.push_back((*i)->get_name());
+			argv.push_back(relative((*i)->get_name(), work_dir).str());
 		else if(SharedLibrary *shlib=dynamic_cast<SharedLibrary *>(tgt))
 			argv.push_back("-l"+shlib->get_libname());
 		else if(dynamic_cast<StaticLibrary *>(tgt))
@@ -53,11 +62,11 @@ Link::Link(Builder &b, const Executable &exe):
 			argv.push_back("-l"+syslib->get_libname());
 	}
 
-	Path::Path epath=exe.get_name();
+	FS::Path epath=exe.get_name();
 	if(!builder.get_dry_run())
-		Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
+		FS::mkpath(FS::dirname(epath), 0755);
 
-	announce(comp.get_package().get_name(), "LINK", relative(epath, comp.get_package().get_source()).str());
+	announce(comp.get_package().get_name(), tool, relative(epath, work_dir).str());
 
 	launch();
 }