X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=16e24c0090c5bf43a45cd3d69a0559ddcb56acd9;hb=c51411c4b3ed4e6a0d8343b848db3dc736bc7857;hp=e2c5c0e71a494e7bb11079a5be0f76725f135b93;hpb=95d5743c0f2a0dd8b56928525b8caa5f6ee8cc1d;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index e2c5c0e..16e24c0 100644
--- 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 <msp/strings/utils.h>
 #include "architecture.h"
 #include "builder.h"
 #include "component.h"
@@ -13,21 +14,16 @@
 using namespace std;
 using namespace Msp;
 
-GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const string &c):
+GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
 	Tool(b, a, t)
 {
-	string command = c;
-	if(architecture->is_cross())
-		command = format("%s-%s", architecture->get_cross_prefix(), command);
-	executable = builder.get_vfs().find_binary(command);
-
 	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 string &) const
+Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
 {
 	if(sources.size()!=1)
 		throw invalid_argument("GnuCCompiler::create_target");
@@ -37,6 +33,45 @@ Target *GnuCompiler::create_target(const list<Target *> &sources, const string &
 	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;
+}
+
+void GnuCompiler::do_prepare()
+{
+	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
 {
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
@@ -46,7 +81,9 @@ 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();
+	BuildInfo binfo;
+	target.collect_build_info(binfo);
+
 	if(binfo.warning_level>=1)
 	{
 		argv.push_back("-Wall");
@@ -60,7 +97,6 @@ Task *GnuCompiler::run(const Target &target) const
 			argv.push_back("-pedantic");
 			argv.push_back("-Wno-long-long");
 			argv.push_back("-Wshadow");
-			argv.push_back("-Winline");
 			if(tag=="CC")
 			{
 				argv.push_back("-Wc++-compat");
@@ -74,10 +110,16 @@ Task *GnuCompiler::run(const Target &target) const
 			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.local_incpath.begin(); i!=binfo.local_incpath.end(); ++i)
+	{
+		argv.push_back("-iquote");
+		argv.push_back(i->str());
+	}
 	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)
@@ -96,13 +138,13 @@ 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 && architecture->get_system()!="windows")
+	if((comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE) && 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();
@@ -117,8 +159,5 @@ Task *GnuCompiler::run(const Target &target) const
 	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);
 }