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

diff --git a/source/link.cpp b/source/link.cpp
index 88ee97a..7d37ac4 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -27,7 +27,7 @@ Link::Link(Builder &b, const Executable &exe):
 
 	//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");
@@ -59,9 +59,9 @@ 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(), tool, relative(epath, comp.get_package().get_source()).str());