X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flink.cpp;h=7d37ac4f619685ccaf4ffea257953480cad805a5;hb=0f5283a54fd188072eca23fbd980a43c6c869913;hp=30fecfba29e49eac2fad7037bfd075a9deb618eb;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/link.cpp b/source/link.cpp
index 30fecfb..7d37ac4 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -26,8 +26,9 @@ Link::Link(Builder &b, const Executable &exe):
 	const Component &comp=exe.get_component();
 
 	//XXX Determine whether to use g++ or gcc
-	argv.push_back(builder.get_tool("LDXX", exe.get_package()->get_arch()));
-	
+	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)
@@ -38,7 +39,7 @@ 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());
 	const TargetList &deps=exe.get_depends();
@@ -58,11 +59,11 @@ Link::Link(Builder &b, const Executable &exe):
 			argv.push_back("-l"+syslib->get_libname());
 	}
 
-	Path::Path epath=exe.get_name();
+	Path epath=exe.get_name();
 	if(!builder.get_dry_run())
-		Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
+		mkpath(epath.subpath(0, epath.size()-1), 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, comp.get_package().get_source()).str());
 
 	launch();
 }