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

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index a8b07f8..52ae0f3 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -22,6 +22,19 @@ GnuLinker::GnuLinker(Builder &b):
 {
 	input_suffixes.push_back(".o");
 	input_suffixes.push_back(".a");
+
+	const Architecture &arch = builder.get_current_arch();
+	if(arch.is_native())
+	{
+		system_path.push_back("/lib");
+		system_path.push_back("/usr/lib");
+		if(arch.match_name("pc-32-linux"))
+			system_path.push_back("/usr/lib/i386-linux-gnu");
+		else if(arch.match_name("pc-64-linux"))
+			system_path.push_back("/usr/lib/x86_64-linux-gnu");
+	}
+	else
+		system_path.push_back("/usr/"+arch.get_cross_prefix()+"/lib");
 }
 
 Target *GnuLinker::create_target(const list<Target *> &sources, const std::string &arg) const
@@ -50,7 +63,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";
 
@@ -59,16 +71,16 @@ Task *GnuLinker::run(const Target &target) const
 		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
 		{
 			const Tool *tool = obj->get_tool();
-			if(dynamic_cast<const GnuCxxCompiler *>(tool))
+			if(tool->get_tag()=="CXX")
 				command = "g++";
 		}
 
 	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");
@@ -79,8 +91,8 @@ Task *GnuLinker::run(const Target &target) const
 		argv.push_back("-static");
 
 	const BuildInfo &binfo = comp.get_build_info();
-	for(list<string>::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
-		argv.push_back("-L"+*i);
+	for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
+		argv.push_back("-L"+i->str());
 	if(binfo.strip)
 		argv.push_back("-s");
 	if(binfo.threads)
@@ -103,8 +115,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())