X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flink.cpp;h=910387e2299b7c55b1d224b6a1b75853673a40ab;hb=4c11e2a041d2064f44b7eb3dbf1976c35fc8881c;hp=14a7d46df7bd77749427c3793c71239c6b8b4bd1;hpb=4d0d003b022943d8a0e39ba19078bab8d32d8857;p=builder.git

diff --git a/source/link.cpp b/source/link.cpp
index 14a7d46..910387e 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -25,9 +25,11 @@ Link::Link(Builder &b, const Executable &exe):
 {
 	const Component &comp=exe.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));
+	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");
@@ -41,7 +43,7 @@ Link::Link(Builder &b, const Executable &exe):
 		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)
 	{
@@ -50,11 +52,11 @@ 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))
-			argv.push_back((*i)->get_name());
+			argv.push_back(relative((*i)->get_name(), work_dir).str());
 		else if(SystemLibrary *syslib=dynamic_cast<SystemLibrary *>(tgt))
 			argv.push_back("-l"+syslib->get_libname());
 	}
@@ -63,7 +65,7 @@ Link::Link(Builder &b, const Executable &exe):
 	if(!builder.get_dry_run())
 		mkpath(epath.subpath(0, epath.size()-1), 0755);
 
-	announce(comp.get_package().get_name(), tool, relative(epath, comp.get_package().get_source()).str());
+	announce(comp.get_package().get_name(), tool, relative(epath, work_dir).str());
 
 	launch();
 }