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

diff --git a/source/link.cpp b/source/link.cpp
index 2ff5a97..2f688be 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -18,12 +18,10 @@ 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());
-
 	//XXX Determine whether to use g++ or gcc
-	argv.push_back(prefix+"g++");
+	argv.push_back(builder.get_tool("LDXX", exe.get_package()->get_arch()));
 	
-	if(comp.get_type()==Component::LIBRARY)
+	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");