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

diff --git a/source/compile.cpp b/source/compile.cpp
index fd802bb..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;
@@ -20,15 +27,11 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 	string ext=Path::splitext(spath.str()).ext;
 	const char *tool=0;
 	if(ext==".cpp" || ext==".cc")
-	{
 		tool="CXX";
-		argv.push_back("g++");
-	}
 	else
-	{
 		tool="CC";
-		argv.push_back("gcc");
-	}
+
+	argv.push_back(builder.get_tool(tool, comp.get_package().get_arch()));
 	argv.push_back("-c");
 	
 	const BuildInfo &binfo=comp.get_build_info();