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

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 719780b..070bdce 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -63,7 +63,7 @@ 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);
@@ -121,8 +121,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)
@@ -141,6 +139,8 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	argv.push_back("-o");
 	argv.push_back(relative(bin.get_path(), work_dir).str());
 
+	bool static_link_ok = (comp.get_package().get_library_mode()<=STATIC);
+
 	const Target::Dependencies &depends = target.get_depends();
 	for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
@@ -151,9 +151,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);