X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=21b765bd25f4ef41b139beaa06f3c58671252581;hb=28bc25948ff58612600ce29a6a0b2cf58548dff9;hp=114bf09c84404910f480a904aa952761366eb2fa;hpb=82ae60a647ebb9567f7177c353245f4d72faaf5e;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 114bf09..21b765b 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -74,11 +74,8 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const string &ar
 		SharedLibrary *shlib = new SharedLibrary(builder, comp, objs);
 		if(architecture->get_system()=="windows")
 		{
-			ExportDefinitions *exp = new ExportDefinitions(builder, comp, *shlib);
-			shlib->add_side_effect(*exp);
 			const Tool &dlltool = builder.get_toolchain().get_tool("DLL");
-			ImportLibrary *imp = dynamic_cast<ImportLibrary *>(dlltool.create_target(*exp));
-			shlib->set_import_library(imp);
+			dlltool.create_target(*shlib);
 		}
 		bin = shlib;
 	}
@@ -95,11 +92,13 @@ Target *GnuLinker::create_install(Target &target) const
 		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.add_installed_target(*shlib->get_import_library());
+			builder.get_build_graph().add_installed_target(*shlib->get_import_library());
 		else
 		{
 			const Pattern &pattern = architecture->get_shared_library_patterns().front();
-			inst_tgt->set_symlink(pattern.apply(shlib->get_libname()));
+			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;
 	}
@@ -174,12 +173,6 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	{
 		argv.push_back("-shared");
 		argv.push_back("-fPIC");
-		const Target::Dependencies &side_eff = target.get_side_effects();
-		for(Target::Dependencies::const_iterator i=side_eff.begin(); i!=side_eff.end(); ++i)
-		{
-			if(ExportDefinitions *exp = dynamic_cast<ExportDefinitions *>(*i))
-				argv.push_back("-Wl,--output-def,"+relative(exp->get_path(), work_dir).str());
-		}
 		if(architecture->get_system()!="windows" && !shlib->get_soname().empty())
 			argv.push_back("-Wl,-soname,"+shlib->get_soname());
 	}
@@ -204,12 +197,13 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	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());
@@ -221,7 +215,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
 			if(shlib)
 				argv.push_back("-l"+shlib->get_libname());
 			else
-				argv.push_back(imp->get_path().str());
+				argv.push_back((file?file:imp)->get_path().str());
 			static_link_ok = false;
 		}
 	}