X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=13352870299778b8ba205092e3e742ed008be813;hb=0e34eb4b0de804174b9ea3e91cbc3ee0063518c6;hp=df0adbc8eff36944b66053d4e83a371902671d66;hpb=d6e5645659cc31231e6da5028ddd0e0aeca19218;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index df0adbc..1335287 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -17,24 +17,23 @@
 using namespace std;
 using namespace Msp;
 
-GnuLinker::GnuLinker(Builder &b):
-	Tool(b, "LINK")
+GnuLinker::GnuLinker(Builder &b, const Architecture &a):
+	Tool(b, a, "LINK")
 {
 	input_suffixes.push_back(".o");
 	input_suffixes.push_back(".a");
 
-	const Architecture &arch = builder.get_current_arch();
-	if(arch.is_native())
+	if(architecture->is_native())
 	{
 		system_path.push_back("/lib");
 		system_path.push_back("/usr/lib");
-		if(arch.match_name("pc-32-linux"))
+		if(architecture->match_name("pc-32-linux"))
 			system_path.push_back("/usr/lib/i386-linux-gnu");
-		else if(arch.match_name("pc-64-linux"))
+		else if(architecture->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");
+		system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/lib");
 
 	default_linker = new Linker(*this, "CC");
 	cxx_linker = new Linker(*this, "CXX");
@@ -64,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);
@@ -95,6 +94,8 @@ GnuLinker::Linker::Linker(GnuLinker &p, const string &compiler_tag):
 			command = "g++";
 		else
 			throw invalid_argument("GnuLinker::Linker::Linker");
+		if(architecture->is_cross())
+			command = format("%s-%s", architecture->get_cross_prefix(), command);
 		executable = builder.get_vfs().find_binary(command);
 	}
 }
@@ -131,10 +132,9 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	if(binfo.threads)
 		argv.push_back("-pthread");
 
-	const Architecture &arch = builder.get_current_arch();
 	const Architecture &native_arch = builder.get_native_arch();
-	if(arch.get_bits()!=native_arch.get_bits())
-		argv.push_back(format("-m%d", arch.get_bits()));
+	if(architecture->get_bits()!=native_arch.get_bits())
+		argv.push_back(format("-m%d", architecture->get_bits()));
 
 	FS::Path work_dir = comp.get_package().get_source();