X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=21b765bd25f4ef41b139beaa06f3c58671252581;hb=766dad2d4f7ca73dc182f22e306ba0def6fd8722;hp=719780bb0441c0cc65e8c02f49ee300666cd1c20;hpb=25a315f3cb5805614c513ac762ea1bd512ce82cb;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 719780b..21b765b 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -3,12 +3,16 @@
 #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"
+#include "exportdefinitions.h"
 #include "externaltask.h"
 #include "gnucompiler.h"
 #include "gnulinker.h"
+#include "importlibrary.h"
+#include "installedfile.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -63,16 +67,45 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const string &ar
 			throw invalid_argument("GnuLinker::create_target");
 	}
 
-	const Component &comp = objs.front()->get_component();
+	const Component &comp = *objs.front()->get_component();
 	Binary *bin = 0;
 	if(arg=="shared")
-		bin = new SharedLibrary(builder, comp, objs);
+	{
+		SharedLibrary *shlib = new SharedLibrary(builder, comp, objs);
+		if(architecture->get_system()=="windows")
+		{
+			const Tool &dlltool = builder.get_toolchain().get_tool("DLL");
+			dlltool.create_target(*shlib);
+		}
+		bin = shlib;
+	}
 	else
 		bin = new Executable(builder, comp, objs);
 	bin->set_tool(*linker);
 	return bin;
 }
 
+Target *GnuLinker::create_install(Target &target) const
+{
+	if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(&target))
+	{
+		const Tool &copy = builder.get_toolchain().get_tool("CP");
+		InstalledFile *inst_tgt = dynamic_cast<InstalledFile *>(copy.create_target(target));
+		if(architecture->get_system()=="windows")
+			builder.get_build_graph().add_installed_target(*shlib->get_import_library());
+		else
+		{
+			const Pattern &pattern = architecture->get_shared_library_patterns().front();
+			string link_name = pattern.apply(shlib->get_libname());
+			if(link_name!=FS::basename(inst_tgt->get_path()))
+				inst_tgt->set_symlink(link_name);
+		}
+		return inst_tgt;
+	}
+	else
+		return 0;
+}
+
 Task *GnuLinker::run(const Target &) const
 {
 	throw logic_error("GnuLinker should not be run directly");
@@ -105,6 +138,26 @@ Target *GnuLinker::Linker::create_target(const list<Target *> &sources, const st
 	return parent.create_target(sources, arg);
 }
 
+Target *GnuLinker::Linker::create_install(Target &target) const
+{
+	return parent.create_install(target);
+}
+
+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);
@@ -114,15 +167,15 @@ Task *GnuLinker::Linker::run(const Target &target) const
 
 	const Component &comp = *bin.get_component();
 
+	FS::Path work_dir = comp.get_package().get_source_directory();
+
 	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&bin))
 	{
 		argv.push_back("-shared");
 		argv.push_back("-fPIC");
-		if(!shlib->get_soname().empty())
+		if(architecture->get_system()!="windows" && !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,26 +189,41 @@ 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();
-
 	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)
 	{
+		FileTarget *file = dynamic_cast<FileTarget *>(*i);
 		Target *tgt = (*i)->get_real_target();
 
 		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
 			argv.push_back(relative(obj->get_path(), work_dir).str());
 		else if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(tgt))
-			argv.push_back(stlib->get_path().str());
+			argv.push_back((file?file:stlib)->get_path().str());
 		else if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(tgt))
+		{
 			argv.push_back("-l"+shlib->get_libname());
+			static_link_ok = false;
+		}
+		else if(ImportLibrary *imp = dynamic_cast<ImportLibrary *>(tgt))
+		{
+			shlib = imp->get_shared_library();
+			if(shlib)
+				argv.push_back("-l"+shlib->get_libname());
+			else
+				argv.push_back((file?file:imp)->get_path().str());
+			static_link_ok = false;
+		}
 	}
 
-	if(!builder.get_dry_run())
-		FS::mkpath(FS::dirname(bin.get_path()), 0755);
+	if(static_link_ok)
+		argv.push_back("-static");
+	else if(architecture->get_system()=="windows")
+		argv.push_back("-Wl,--enable-auto-import");
 
 	return new ExternalTask(argv, work_dir);
 }