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

diff --git a/source/link.cpp b/source/link.cpp
index 7cbdc03..0d94e5a 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -2,9 +2,13 @@
 #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;
@@ -19,21 +23,33 @@ Link::Link(Builder &b, const Executable &exe):
 	
 	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 TargetList &deps=exe.get_depends();
 	for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-		if(dynamic_cast<ObjectFile *>(*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())