X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Flink.cpp;h=0d94e5ab62251c14c4a49ffea687cfb3ab3d3077;hb=40eb101a642b9ed2e898eec39e0916fa71066b23;hp=96089da8b58116ee24d95b9d57171bca04d0cd8c;hpb=f1c967215e6b08095bdf07518472beca3067ec37;p=builder.git

diff --git a/source/link.cpp b/source/link.cpp
index 96089da..0d94e5a 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -2,35 +2,54 @@
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
+#include "install.h"
 #include "link.h"
 #include "objectfile.h"
 #include "package.h"
+#include "sharedlibrary.h"
+#include "staticlibrary.h"
+#include "systemlibrary.h"
 
 using namespace std;
 using namespace Msp;
 
-Link::Link(Builder &b, const Executable &exe, const Component &comp):
+Link::Link(Builder &b, const Executable &exe):
 	ExternalAction(b)
 {
+	const Component &comp=exe.get_component();
+
+	//XXX Determine whether to use g++ or gcc
 	argv.push_back("g++");
 	
 	if(comp.get_type()==Component::LIBRARY)
 		argv.push_back("-shared");
+	else if(comp.get_package().get_config().get_option("staticlibs").value=="all")
+		argv.push_back("-static");
 
 	const BuildInfo &binfo=comp.get_build_info();
 	for(list<string>::const_iterator i=binfo.ldflags.begin(); i!=binfo.ldflags.end(); ++i)
 		argv.push_back(*i);
 	for(list<string>::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
 		argv.push_back("-L"+*i);
-	for(list<string>::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-		argv.push_back("-l"+*i);
 	
 	argv.push_back("-o");
 	argv.push_back(exe.get_name());
-	const list<Target *> &deps=exe.get_depends();
-	for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-		if(dynamic_cast<ObjectFile *>(*i))
+	const TargetList &deps=exe.get_depends();
+	for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+	{
+		Target *tgt=*i;
+		if(dynamic_cast<Install *>(tgt))
+			tgt=tgt->get_depends().front();
+
+		if(dynamic_cast<ObjectFile *>(tgt))
+			argv.push_back((*i)->get_name());
+		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());
+		else if(SystemLibrary *syslib=dynamic_cast<SystemLibrary *>(tgt))
+			argv.push_back("-l"+syslib->get_libname());
+	}
 
 	Path::Path epath=exe.get_name();
 	if(!builder.get_dry_run())