X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=52ae0f3ea45a90a97108435f27edc573e31e5c86;hb=58a28fb253292942e042288f1a621b64e0c2ca90;hp=3693e2b0cc08386c6d9cb3bceecee05aa1d72455;hpb=f43af45e011a432c5e43611dac4ebd5ca1fe1726;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 3693e2b..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
@@ -78,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)