X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=6ea88718fa4d8c3af4f3c2d91863eabefbe74531;hb=740d7cdd71fc2f068e44bfc6c8cc7e9565de16f6;hp=13352870299778b8ba205092e3e742ed008be813;hpb=2aaad259f2dff58c1e909f1e6d83961e78fd7d3e;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 1335287..6ea8871 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -3,6 +3,7 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
@@ -105,6 +106,21 @@ Target *GnuLinker::Linker::create_target(const list<Target *> &sources, const st
 	return parent.create_target(sources, arg);
 }
 
+string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const
+{
+	string result = FS::basename(executable->get_path());
+	result += ',';
+	if(binfo.libmode<=BuildInfo::STATIC)
+		result += 't';
+	else
+		result += 'd';
+	if(binfo.strip)
+		result += 's';
+	result += ",l";
+	result += join(binfo.libs.begin(), binfo.libs.end(), ",l");
+	return result;
+}
+
 Task *GnuLinker::Linker::run(const Target &target) const
 {
 	const Binary &bin = dynamic_cast<const Binary &>(target);
@@ -121,8 +137,6 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		if(!shlib->get_soname().empty())
 			argv.push_back("-Wl,-soname,"+shlib->get_soname());
 	}
-	else if(comp.get_package().get_library_mode()==ALL_STATIC)
-		argv.push_back("-static");
 
 	const BuildInfo &binfo = comp.get_build_info();
 	for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
@@ -136,12 +150,14 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	if(architecture->get_bits()!=native_arch.get_bits())
 		argv.push_back(format("-m%d", architecture->get_bits()));
 
-	FS::Path work_dir = comp.get_package().get_source();
+	FS::Path work_dir = comp.get_package().get_source_directory();
 
 	argv.push_back("-o");
 	argv.push_back(relative(bin.get_path(), work_dir).str());
 
-	const Target::Dependencies &depends = target.get_depends();
+	bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC);
+
+	const Target::Dependencies &depends = target.get_dependencies();
 	for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
 		Target *tgt = (*i)->get_real_target();
@@ -151,9 +167,15 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		else if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(tgt))
 			argv.push_back(stlib->get_path().str());
 		else if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(tgt))
+		{
 			argv.push_back("-l"+shlib->get_libname());
+			static_link_ok = false;
+		}
 	}
 
+	if(static_link_ok)
+		argv.push_back("-static");
+
 	if(!builder.get_dry_run())
 		FS::mkpath(FS::dirname(bin.get_path()), 0755);