Use Path objects to store include and library paths

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 189e5148285c827015aaf203c2891a00ece39047..5ecd29307fc9ac8339cc95090dddaf228e6beaed 100644 (file)
--- 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
 {
@@ -37,10 +44,10 @@ Task *GnuCompiler::run(const Target &target) const
        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())