X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=plugins%2Fgnu%2Fgnulinker.cpp;h=3d81fcca6156236a58d9f943dc05136eb1d8ff9b;hb=52719526cc36271872280b987c7bf2393073f98b;hp=710c44b9b3f0bfaf722be1372691775d66b8a718;hpb=c8e829c219c65ff8e93b6c7b66212ff0876441c5;p=builder.git

diff --git a/plugins/gnu/gnulinker.cpp b/plugins/gnu/gnulinker.cpp
index 710c44b..3d81fcc 100644
--- a/plugins/gnu/gnulinker.cpp
+++ b/plugins/gnu/gnulinker.cpp
@@ -37,6 +37,19 @@ Target *GnuLinker::create_target(const vector<Target *> &sources, const string &
 {
 	if(sources.empty())
 		throw invalid_argument("GnuLinker::create_target");
+
+	if(arg=="import")
+	{
+		if(sources.size()!=1)
+			throw invalid_argument("GnuLinker::create_target");
+		SharedLibrary &shlib = dynamic_cast<SharedLibrary &>(*sources.front());
+		if(architecture->get_system()!="windows")
+			return 0;
+
+		Tool &dlltool = builder.get_toolchain().get_tool("DLL");
+		return dlltool.create_target(shlib);
+	}
+
 	vector<ObjectFile *> objs;
 	objs.reserve(sources.size());
 	for(Target *s: sources)
@@ -45,15 +58,7 @@ Target *GnuLinker::create_target(const vector<Target *> &sources, const string &
 	const Component &comp = *objs.front()->get_component();
 	Binary *bin = 0;
 	if(arg=="shared")
-	{
-		SharedLibrary *shlib = new SharedLibrary(builder, comp, objs);
-		if(architecture->get_system()=="windows")
-		{
-			Tool &dlltool = builder.get_toolchain().get_tool("DLL");
-			dlltool.create_target(*shlib);
-		}
-		bin = shlib;
-	}
+		bin = new SharedLibrary(builder, comp, objs);
 	else
 		bin = new Executable(builder, comp, objs);
 	bin->set_tool(*this);
@@ -66,9 +71,7 @@ Target *GnuLinker::create_install(Target &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
+		if(architecture->get_system()!="windows")
 		{
 			string link_name = architecture->create_filename<SharedLibrary>(shlib->get_libname());
 			if(link_name!=FS::basename(inst_tgt->get_path()))
@@ -316,9 +319,6 @@ ExternalTask::Arguments GnuLinker::_run(const Binary &bin, FS::Path &work_dir)
 			if(i!=binfo.libmodes.end() && i->second<=BuildInfo::STATIC)
 				argv.push_back("-static-libstdc++");
 		}
-
-		if(arch.get_system()=="windows")
-			argv.push_back("-Wl,--enable-auto-import");
 	}
 
 	return argv;