X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=6daa99d81a565c482c05f6a49127986d0a457ead;hb=081e13e6f146d1685bdcb1ec1c82752f4c6d264d;hp=ec1959afae67cfaf3a3f4a82e25e8a8c748f1a7a;hpb=7ed7c30ee0ceb734f17fe0c6d4bc6d37fb2ab5a7;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index ec1959a..6daa99d 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,6 +1,8 @@
+#include <msp/core/maputils.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "architecture.h"
 #include "builder.h"
 #include "component.h"
@@ -13,11 +15,26 @@
 using namespace std;
 using namespace Msp;
 
-GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const string &c):
-	Tool(b, a, t),
-	command(c)
+namespace {
+
+const char *cpus[] =
+{
+	"athlonxp", "athlon-xp",
+	"armv7a",   "armv7-a",
+	0
+};
+
+}
+
+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");
@@ -54,7 +71,22 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 
 void GnuCompiler::do_prepare()
 {
-	set_executable(command, true);
+	executable = builder.get_vfs().find_binary(command);
+	if(executable)
+	{
+		ExternalTask::Arguments argv;
+		argv.push_back(executable->get_path().str());
+		argv.push_back("-dumpversion");
+
+		builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+		try
+		{
+			version = strip(ExternalTask::run_and_capture_output(argv));
+			builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
+		}
+		catch(const runtime_error &)
+		{ }
+	}
 }
 
 Task *GnuCompiler::run(const Target &target) const
@@ -66,7 +98,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");
@@ -98,6 +138,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");
@@ -105,6 +149,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())
@@ -112,6 +157,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)
@@ -121,18 +167,26 @@ Task *GnuCompiler::run(const Target &target) const
 		else
 			argv.push_back(format("-O%d", binfo.optimize));
 	}
-	if(binfo.threads)
+	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();
+	string cpu = architecture->get_cpu();
 	if(!cpu.empty())
+	{
+		for(unsigned i=0; cpus[i]; i+=2)
+			if(cpu==cpus[i])
+			{
+				cpu = cpus[i+1];
+				break;
+			}
 		argv.push_back("-march="+cpu);
+	}
 
 	FS::Path obj_path = object.get_path();
 	FS::Path src_path = object.get_source().get_path();