X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=b3f56175c034790d427cec316b12f3a7b2680773;hb=e7ce61ee5684a5152d326af8e756cbdb987ff5f8;hp=816a9a31eaf196e461e9ea3ca2423bd4804f2a38;hpb=921e8234ff65bd23c0b94ed568ec1fb68e47655b;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 816a9a3..b3f5617 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,13 +1,14 @@
 #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"
+#include "csourcefile.h"
 #include "externaltask.h"
 #include "gnucompiler.h"
+#include "objcsourcefile.h"
 #include "objectfile.h"
 #include "sourcefile.h"
 #include "sourcepackage.h"
@@ -26,18 +27,46 @@ const char *cpus[] =
 
 }
 
-GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const FS::Path &sysroot):
-	Tool(b, a, t)
+GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
+	Tool(b, a, t),
+	version(0)
 {
-	if(!sysroot.empty())
+	if(tag=="CC")
+	{
+		input_suffixes.push_back(".c");
+		aux_suffixes.push_back(".h");
+	}
+	else if(tag=="CXX")
+	{
+		input_suffixes.push_back(".cpp");
+		input_suffixes.push_back(".cc");
+		aux_suffixes.push_back(".hpp");
+	}
+	else if(tag=="OBJC")
 	{
-		build_info.sysroot = sysroot;
-		system_path.push_back(sysroot/"usr/include");
+		input_suffixes.push_back(".m");
+		build_info.libs.push_back("objc");
 	}
-	else if(architecture->is_native())
-		system_path.push_back("/usr/include");
 	else
-		system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
+		throw invalid_argument("GnuCompiler::GnuCompiler");
+
+	set_command((tag=="CXX" ? "g++" : "gcc"), true);
+}
+
+Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
+{
+	if(tag=="OBJC")
+		return new ObjCSourceFile(builder, comp, path);
+	else
+		return new CSourceFile(builder, comp, path);
+}
+
+Target *GnuCompiler::create_source(const FS::Path &path) const
+{
+	if(tag=="OBJC")
+		return new ObjCSourceFile(builder, path);
+	else
+		return new CSourceFile(builder, path);
 }
 
 Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
@@ -52,6 +81,9 @@ Target *GnuCompiler::create_target(const list<Target *> &sources, const string &
 
 string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 {
+	if(!executable)
+		return string();
+
 	string result = FS::basename(executable->get_path());
 	if(!architecture->get_cpu().empty())
 	{
@@ -72,21 +104,97 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 void GnuCompiler::do_prepare()
 {
 	executable = builder.get_vfs().find_binary(command);
+	prepare_syspath();
+	prepare_version();
+}
+
+void GnuCompiler::prepare_syspath()
+{
+	bool path_found = false;
+	const FS::Path &sysroot = build_info.sysroot;
+
 	if(executable)
 	{
 		ExternalTask::Arguments argv;
 		argv.push_back(executable->get_path().str());
-		argv.push_back("-dumpversion");
+		argv.push_back("-Wp,-v");
+		argv.push_back("-E");
+		if(tag=="CXX")
+			argv.push_back("-xc++");
+		if(!sysroot.empty())
+			argv.push_back("--sysroot="+sysroot.str());
+		argv.push_back("-");
 
 		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));
+			string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
+			string::size_type start = 0;
+			bool record_path = false;
+			while(start<output.size())
+			{
+				string::size_type newline = output.find('\n', start);
+				if(!output.compare(start, 34, "#include <...> search starts here:"))
+				{
+					record_path = true;
+					path_found = true;
+				}
+				else if(!output.compare(start, 19, "End of search list."))
+					record_path = false;
+				else if(record_path)
+				{
+					FS::Path path = strip(output.substr(start, newline-start));
+					builder.get_logger().log("tools", format("Got %s system path: %s", tag, path));
+					system_path.push_back(path);
+				}
+				start = newline+1;
+			}
 		}
-		catch(const runtime_error &)
+		catch(const runtime_error &e)
 		{ }
 	}
+
+	if(!path_found)
+	{
+		builder.get_logger().log("tools", format("No %s system path found, using defaults", tag));
+		if(!sysroot.empty())
+			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");
+	}
+}
+
+void GnuCompiler::prepare_version()
+{
+	if(!executable)
+		return;
+
+	prepare_version("-dumpversion");
+	if(version>=0x70000)
+		prepare_version("-dumpfullversion");
+	builder.get_logger().log("tools", format("%s version is %d.%d.%d", FS::basename(executable->get_path()), version>>16, (version>>8)&0xFF, version&0xFF));
+}
+
+void GnuCompiler::prepare_version(const string &arg)
+{
+	ExternalTask::Arguments argv;
+	argv.push_back(executable->get_path().str());
+	argv.push_back(arg);
+
+	builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+	try
+	{
+		string version_str = strip(ExternalTask::run_and_capture_output(argv));
+
+		vector<string> version_parts = split(version_str, '.');
+		version = 0;
+		for(unsigned i=0; (i<3 && i<version_parts.size()); ++i)
+			version |= lexical_cast<unsigned>(version_parts[i])<<(16-8*i);
+	}
+	catch(const runtime_error &)
+	{ }
 }
 
 Task *GnuCompiler::run(const Target &target) const
@@ -113,6 +221,8 @@ Task *GnuCompiler::run(const Target &target) const
 		{
 			argv.push_back("-Wextra");
 			argv.push_back("-Wundef");
+			if(version>=0x80000)
+				argv.push_back("-Wno-cast-function-type");
 		}
 		if(binfo.warning_level>=3)
 		{