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

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 34b4e94..6989e2d 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,13 @@ using namespace Msp;
 GnuCompiler::GnuCompiler(Builder &b, const string &t, const string &n):
 	Tool(b, t),
 	name(n)
-{ }
+{
+	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,7 +39,7 @@ Task *GnuCompiler::run(const Target &target) const
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
 	const Component &comp = object.get_component();
 
-	vector<string> argv;
+	ExternalTask::Arguments argv;
 	argv.push_back(name);
 	argv.push_back("-c");