X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flink.cpp;h=2f688be4cbd73fb1788348a717de1df52bcdeb3c;hb=55b6c1dba6f02a399d98080c23a75098e8a080f7;hp=0d94e5ab62251c14c4a49ffea687cfb3ab3d3077;hpb=4f78d9f016482ce1ac7d726852e33e07c090df1b;p=builder.git

diff --git a/source/link.cpp b/source/link.cpp
index 0d94e5a..2f688be 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -19,11 +19,11 @@ Link::Link(Builder &b, const Executable &exe):
 	const Component &comp=exe.get_component();
 
 	//XXX Determine whether to use g++ or gcc
-	argv.push_back("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_config().get_option("staticlibs").value=="all")
+	else if(comp.get_package().get_library_mode()==ALL_STATIC)
 		argv.push_back("-static");
 
 	const BuildInfo &binfo=comp.get_build_info();