X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=9f6230e481f2f0260275d19d9a88e2ff4a41e46e;hb=bf227e1b5e956cb8554d9e57077a02d3aa169bf2;hp=a132acecf5b9f0f85bb1220c2edb08098f0a4829;hpb=fe305f49aae7b7dff4c6be6f7bb8d403ccf53768;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index a132ace..9f6230e 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -300,9 +300,6 @@ Task *GnuLinker::Linker::run(const Target &target) const
 
 	bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC);
 
-	if(architecture->get_system()=="windows" && architecture->get_cross_prefix().find("mingw")!=string::npos)
-		argv.push_back("-lmingw32");
-
 	const Target::Dependencies &depends = target.get_dependencies();
 	for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
@@ -338,8 +335,18 @@ Task *GnuLinker::Linker::run(const Target &target) const
 
 	if(static_link_ok)
 		argv.push_back("-static");
-	else if(architecture->get_system()=="windows")
-		argv.push_back("-Wl,--enable-auto-import");
+	else
+	{
+		if(compiler_tag=="CXX")
+		{
+			BuildInfo::LibModeMap::const_iterator i = binfo.libmodes.find("stdc++");
+			if(i!=binfo.libmodes.end() && i->second<=BuildInfo::STATIC)
+				argv.push_back("-static-libstdc++");
+		}
+
+		if(architecture->get_system()=="windows")
+			argv.push_back("-Wl,--enable-auto-import");
+	}
 
 	return new ExternalTask(argv, work_dir);
 }