X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucxxcompiler.cpp;h=87fe1642801fbd466f92474fb9e69d25f76c1fae;hb=69cd5cc73f466181420711fb907979de58687a4c;hp=7c863a51b2ad5aff193b340bceedcbd42021a34d;hpb=7e5ac6af8987bf12f3e338d00e96e8cb74f3534b;p=builder.git

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index 7c863a5..87fe164 100644
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,16 +1,37 @@
+#include <msp/fs/stat.h>
 #include "csourcefile.h"
 #include "gnucxxcompiler.h"
 
+using namespace std;
 using namespace Msp;
 
-GnuCxxCompiler::GnuCxxCompiler(Builder &b):
-	GnuCompiler(b, "CXX", "g++")
+GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a, const FS::Path &sysroot):
+	GnuCompiler(b, a, "CXX", sysroot)
 {
+	set_command("g++", true);
 	input_suffixes.push_back(".cpp");
 	input_suffixes.push_back(".cc");
+	aux_suffixes.push_back(".hpp");
 }
 
 Target *GnuCxxCompiler::create_source(const Component &comp, const FS::Path &path) const
 {
 	return new CSourceFile(builder, comp, path);
 }
+
+Target *GnuCxxCompiler::create_source(const FS::Path &path) const
+{
+	return new CSourceFile(builder, path);
+}
+
+void GnuCxxCompiler::do_prepare()
+{
+	GnuCompiler::do_prepare();
+	if(!version.empty())
+	{
+		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);
+	}
+}