X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=d07f3ef4ee3255cbef1d1299a72c13dffad8db00;hb=654de39b62a9a58fd8e1b5a557361d628345788b;hp=02ae493ea1892a4002c320a88d4ab9997ade1634;hpb=57bdb055acb0453c75b22cb64f35cc0e817a2827;p=builder.git

diff --git a/source/compile.cpp b/source/compile.cpp
index 02ae493..d07f3ef 100644
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -1,10 +1,17 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "buildinfo.h"
 #include "compile.h"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -17,20 +24,14 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 	const TargetList &deps=obj.get_depends();
 	Path::Path spath=deps.front()->get_name();
 
-	const string &prefix=b.get_arch_prefix(obj.get_package()->get_arch());
-
 	string ext=Path::splitext(spath.str()).ext;
 	const char *tool=0;
 	if(ext==".cpp" || ext==".cc")
-	{
 		tool="CXX";
-		argv.push_back(prefix+"g++");
-	}
 	else
-	{
 		tool="CC";
-		argv.push_back(prefix+"gcc");
-	}
+
+	argv.push_back(builder.get_tool(tool, comp.get_package().get_arch()));
 	argv.push_back("-c");
 	
 	const BuildInfo &binfo=comp.get_build_info();