X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=ad9de775f3acecf3534cf61b37b6b630fc2574ab;hb=2606b03da59dc10e3826b833a2fceb0831d79972;hp=a8b07f8499bdc8307a8378a93c46147dbb70ad5e;hpb=45c778b1976de1a3093e0c6fb5e2a94c42073dcb;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index a8b07f8..ad9de77 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -50,7 +50,6 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const std::strin
 Task *GnuLinker::run(const Target &target) const
 {
 	const Binary &bin = dynamic_cast<const Binary &>(target);
-	const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&bin);
 
 	string command = "gcc";
 
@@ -66,9 +65,9 @@ Task *GnuLinker::run(const Target &target) const
 	vector<string> argv;
 	argv.push_back(command);
 
-	const Component &comp = bin.get_component();
+	const Component &comp = *bin.get_component();
 
-	if(shlib)
+	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&bin))
 	{
 		argv.push_back("-shared");
 		argv.push_back("-fPIC");
@@ -103,8 +102,8 @@ Task *GnuLinker::run(const Target &target) const
 			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());
-		else if(Library *lib = dynamic_cast<Library *>(tgt))
-			argv.push_back("-l"+lib->get_libname());
+		else if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(tgt))
+			argv.push_back("-l"+shlib->get_libname());
 	}
 
 	if(!builder.get_dry_run())