X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=051722832ea66402e515733fb51cd5c6ad78aa8e;hb=c75c89d2425ab0c69e94d45a5d956286838bbc67;hp=bff5f8cd145106520005052184d04da274e4ae90;hpb=7777d548fddca66b21f26273faedfdf675b10234;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index bff5f8c..0517228 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
@@ -14,10 +15,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");
@@ -81,7 +87,15 @@ Task *GnuCompiler::run(const Target &target) const
 	argv.push_back(executable->get_path().str());
 	argv.push_back("-c");
 
-	const BuildInfo &binfo = comp.get_build_info_for_path(object.get_source().get_path());
+	BuildInfo binfo;
+	target.collect_build_info(binfo);
+
+	string tag_for_std = (tag=="OBJC" ? "CC" : tag);
+	if(binfo.standards.count(tag_for_std))
+		argv.push_back("-std="+get_item(binfo.standards, tag_for_std));
+	if(tag=="OBJC" && binfo.standards.count(tag))
+		argv.push_back("-fobjc-std="+get_item(binfo.standards, tag));
+
 	if(binfo.warning_level>=1)
 	{
 		argv.push_back("-Wall");
@@ -113,6 +127,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");
@@ -120,6 +138,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())
@@ -127,6 +146,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)
@@ -138,11 +158,11 @@ Task *GnuCompiler::run(const Target &target) const
 	}
 	if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin")
 		argv.push_back("-pthread");
-	if((comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE) && architecture->get_system()!="windows")
+	if(object.is_used_in_shared_library() && architecture->get_system()!="windows")
 		argv.push_back("-fPIC");
 
 	const Architecture &native_arch = builder.get_native_arch();
-	if(architecture->get_bits()!=native_arch.get_bits())
+	if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
 		argv.push_back(format("-m%d", architecture->get_bits()));
 
 	const string &cpu = architecture->get_cpu();