X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flink.cpp;h=96089da8b58116ee24d95b9d57171bca04d0cd8c;hb=63adab21a6f229f434b41eb59c5718fdc3c37b15;hp=242c966dfab7ab58acc77054e1ae0478e7f70ed8;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/link.cpp b/source/link.cpp
index 242c966..96089da 100644
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -1,7 +1,9 @@
 #include <msp/path/utils.h>
+#include "builder.h"
 #include "component.h"
 #include "executable.h"
 #include "link.h"
+#include "objectfile.h"
 #include "package.h"
 
 using namespace std;
@@ -12,6 +14,9 @@ Link::Link(Builder &b, const Executable &exe, const Component &comp):
 {
 	argv.push_back("g++");
 	
+	if(comp.get_type()==Component::LIBRARY)
+		argv.push_back("-shared");
+
 	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);
@@ -24,10 +29,12 @@ Link::Link(Builder &b, const Executable &exe, const Component &comp):
 	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)
-		argv.push_back((*i)->get_name());
+		if(dynamic_cast<ObjectFile *>(*i))
+			argv.push_back((*i)->get_name());
 
 	Path::Path epath=exe.get_name();
-	Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
+	if(!builder.get_dry_run())
+		Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
 
 	announce(comp.get_package().get_name(), "LINK", relative(epath, comp.get_package().get_source()).str());