X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=87fd6623ee91a58ce606d905a95ee8eace56532e;hb=f75a99316e896cf1e424a489ce360a67844d86b0;hp=34b4e947a49e2f2637443e3d2f4aca70403ce006;hpb=7e5ac6af8987bf12f3e338d00e96e8cb74f3534b;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 34b4e94..87fd662 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,6 +1,7 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include "architecture.h"
 #include "builder.h"
 #include "component.h"
 #include "externaltask.h"
@@ -15,7 +16,15 @@ using namespace Msp;
 GnuCompiler::GnuCompiler(Builder &b, const string &t, const string &n):
 	Tool(b, t),
 	name(n)
-{ }
+{
+	executable = builder.get_vfs().find_binary(name);
+
+	const Architecture &arch = builder.get_current_arch();
+	if(arch.is_native())
+		system_path.push_back("/usr/include");
+	else
+		system_path.push_back("/usr/"+arch.get_cross_prefix()+"/include");
+}
 
 Target *GnuCompiler::create_target(const list<Target *> &sources, const std::string &) const
 {
@@ -32,15 +41,15 @@ Task *GnuCompiler::run(const Target &target) const
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
 	const Component &comp = object.get_component();
 
-	vector<string> argv;
-	argv.push_back(name);
+	ExternalTask::Arguments argv;
+	argv.push_back(executable->get_path().str());
 	argv.push_back("-c");
 
 	const BuildInfo &binfo = comp.get_build_info();
-	for(list<string>::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
+	for(BuildInfo::WordList::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
 		argv.push_back("-W"+*i);
-	for(list<string>::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-		argv.push_back("-I"+*i);
+	for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
+		argv.push_back("-I"+i->str());
 	for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
 	{
 		if(i->second.empty())