X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=1b05a5cb6e99b459ff9f4f3ea3a63f3a8378295f;hb=217889f81407de43d8de469ad93e05b7d334ae0c;hp=16e24c0090c5bf43a45cd3d69a0559ddcb56acd9;hpb=3f0f7216789aeedba206308c452623351e406e75;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 16e24c0..1b05a5c 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -14,10 +14,15 @@
 using namespace std;
 using namespace Msp;
 
-GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
+GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const FS::Path &sysroot):
 	Tool(b, a, t)
 {
-	if(architecture->is_native())
+	if(!sysroot.empty())
+	{
+		build_info.sysroot = sysroot;
+		system_path.push_back(sysroot/"usr/include");
+	}
+	else if(architecture->is_native())
 		system_path.push_back("/usr/include");
 	else
 		system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
@@ -115,6 +120,10 @@ Task *GnuCompiler::run(const Target &target) const
 		if(binfo.fatal_warnings)
 			argv.push_back("-Werror");
 	}
+
+	const FS::Path &sysroot = binfo.sysroot;
+	if(!sysroot.empty())
+		argv.push_back("--sysroot="+sysroot.str());
 	for(BuildInfo::PathList::const_iterator i=binfo.local_incpath.begin(); i!=binfo.local_incpath.end(); ++i)
 	{
 		argv.push_back("-iquote");
@@ -122,6 +131,7 @@ Task *GnuCompiler::run(const Target &target) const
 	}
 	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())
@@ -129,6 +139,7 @@ Task *GnuCompiler::run(const Target &target) const
 		else
 			argv.push_back(format("-D%s=%s", i->first, i->second));
 	}
+
 	if(binfo.debug)
 		argv.push_back("-ggdb");
 	if(binfo.optimize)