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

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 816a9a3..ea04fbe 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,13 +1,16 @@
 #include <msp/core/maputils.h>
 #include <msp/fs/dir.h>
+#include <msp/fs/stat.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"
@@ -29,6 +32,27 @@ const char *cpus[] =
 GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const FS::Path &sysroot):
 	Tool(b, a, t)
 {
+	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")
+	{
+		input_suffixes.push_back(".m");
+		build_info.libs.push_back("objc");
+	}
+	else
+		throw invalid_argument("GnuCompiler::GnuCompiler");
+
+	set_command((tag=="CXX" ? "g++" : "gcc"), true);
+
 	if(!sysroot.empty())
 	{
 		build_info.sysroot = sysroot;
@@ -40,6 +64,22 @@ GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, con
 		system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
 }
 
+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 &)
 {
 	if(sources.size()!=1)
@@ -83,6 +123,14 @@ void GnuCompiler::do_prepare()
 		{
 			version = strip(ExternalTask::run_and_capture_output(argv));
 			builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
+
+			if(tag=="CXX")
+			{
+				const FS::Path &sysroot = build_info.sysroot;
+				FS::Path cxx_path = sysroot/"usr"/"include"/"c++"/version;
+				if(FS::is_dir(cxx_path))
+					system_path.push_back(cxx_path);
+			}
 		}
 		catch(const runtime_error &)
 		{ }