X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=a3052df1a6d4a4b2041ec5940e75239d4f6ffccf;hb=323285f97a1a6fe2628f818371a8b03f233dd036;hp=62a7e32dcd1c879be0d55bb25075a2b04f676189;hpb=338eefb513953ae55e8e3614c009c242ba8ad74e;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 62a7e32..a3052df 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,5 +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"
@@ -11,17 +13,23 @@
 using namespace std;
 using namespace Msp;
 
-GnuCompiler::GnuCompiler(Builder &b, const string &t, const string &n):
-	Tool(b, t),
-	name(n)
-{ }
-
-Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
+GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const string &c):
+	Tool(b, a, t)
 {
-	return new SourceFile(builder, comp, path);
+	string command = c;
+	if(architecture->is_cross())
+		command = format("%s-%s", architecture->get_cross_prefix(), command);
+	executable = builder.get_vfs().find_binary(command);
+	if(!executable)
+		builder.problem(string(), format("Can't find executable %s for tool %s", command, tag));
+
+	if(architecture->is_native())
+		system_path.push_back("/usr/include");
+	else
+		system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
 }
 
-Target *GnuCompiler::create_target(const list<Target *> &sources, const std::string &) const
+Target *GnuCompiler::create_target(const list<Target *> &sources, const string &) const
 {
 	if(sources.size()!=1)
 		throw invalid_argument("GnuCCompiler::create_target");
@@ -31,35 +39,104 @@ Target *GnuCompiler::create_target(const list<Target *> &sources, const std::str
 	return obj;
 }
 
+string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
+{
+	string result = FS::basename(executable->get_path());
+	if(!architecture->get_cpu().empty())
+	{
+		result += ",m";
+		result += architecture->get_cpu();
+	}
+	result += ',';
+	if(binfo.debug)
+		result += 'g';
+	if(binfo.optimize)
+	{
+		result += 'O';
+		result += (binfo.optimize>0 ? '0'+binfo.optimize : 's');
+	}
+	return result;
+}
+
 Task *GnuCompiler::run(const Target &target) const
 {
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
-	const Component &comp = object.get_component();
+	const Component &comp = *object.get_component();
 
-	vector<string> argv;
-	argv.push_back(name);
+	ExternalTask::Arguments argv;
+	argv.push_back(executable->get_path().str());
 	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)
-		argv.push_back("-W"+*i);
-	for(list<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
-		argv.push_back(*i);
-	for(list<string>::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-		argv.push_back("-I"+*i);
-	for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
-		argv.push_back("-D"+*i);
+	if(binfo.warning_level>=1)
+	{
+		argv.push_back("-Wall");
+		if(binfo.warning_level>=2)
+		{
+			argv.push_back("-Wextra");
+			argv.push_back("-Wundef");
+		}
+		if(binfo.warning_level>=3)
+		{
+			argv.push_back("-pedantic");
+			argv.push_back("-Wno-long-long");
+			argv.push_back("-Wshadow");
+			if(tag=="CC")
+			{
+				argv.push_back("-Wc++-compat");
+				argv.push_back("-Wstrict-prototypes");
+			}
+		}
+		if(binfo.warning_level>=4)
+		{
+			// Some truly paranoid warnings
+			argv.push_back("-Wstrict-overflow=4");
+			argv.push_back("-Wfloat-equal");
+			argv.push_back("-Wconversion");
+			argv.push_back("-Wwrite-strings");
+			argv.push_back("-Winline");
+		}
+		if(binfo.fatal_warnings)
+			argv.push_back("-Werror");
+	}
+	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())
+			argv.push_back(format("-D%s", i->first));
+		else
+			argv.push_back(format("-D%s=%s", i->first, i->second));
+	}
+	if(binfo.debug)
+		argv.push_back("-ggdb");
+	if(binfo.optimize)
+	{
+		if(binfo.optimize<0)
+			argv.push_back("-Os");
+		else
+			argv.push_back(format("-O%d", binfo.optimize));
+	}
+	if(binfo.threads)
+		argv.push_back("-pthread");
+	if(comp.get_type()==Component::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())
+		argv.push_back(format("-m%d", architecture->get_bits()));
+
+	const string &cpu = architecture->get_cpu();
+	if(!cpu.empty())
+		argv.push_back("-march="+cpu);
 
 	FS::Path obj_path = object.get_path();
 	FS::Path src_path = object.get_source().get_path();
-	FS::Path work_dir = comp.get_package().get_source();
+	FS::Path work_dir = comp.get_package().get_source_directory();
 
 	argv.push_back("-o");
 	argv.push_back(relative(obj_path, work_dir).str());
 	argv.push_back(relative(src_path, work_dir).str());
 
-	if(!builder.get_dry_run())
-		FS::mkpath(FS::dirname(obj_path), 0755);
-
 	return new ExternalTask(argv, work_dir);
 }