X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=61b17ad90807c65b0c85c649fbabe7c31a5cc6cc;hb=329dc80e392faf7354338621e73dba1880fc767d;hp=67278d16bdb2457efa8694962f909891c58a1baa;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/compile.cpp b/source/compile.cpp
index 67278d1..61b17ad 100644
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -11,7 +11,7 @@ Distributed under the LGPL
 #include "compile.h"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -31,9 +31,9 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 	else
 		tool="CC";
 
-	argv.push_back(builder.get_tool(tool, obj.get_package()->get_arch()));
+	argv.push_back(builder.get_architecture(comp.get_package().get_arch()).get_tool(tool));
 	argv.push_back("-c");
-	
+
 	const BuildInfo &binfo=comp.get_build_info();
 	for(list<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
 		argv.push_back(*i);
@@ -41,7 +41,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 		argv.push_back("-I"+*i);
 	for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
 		argv.push_back("-D"+*i);
-	
+
 	Path::Path opath=obj.get_name();
 	argv.push_back("-o");
 	argv.push_back(opath.str());