X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucxxcompiler.cpp;h=d1d05d8b80b9ce6b5b1da5a24b8b0491c4f5a899;hb=35f2979869bff43706f3163ec0979c7084aaa3c4;hp=fb7fbdce2cf37d0601f545e40c71d5c9528e0a5d;hpb=dceec8d95c63aaf4d8d4b367c9846caf9e32a6bf;p=builder.git

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index fb7fbdc..d1d05d8 100644
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,11 +1,14 @@
+#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");
@@ -15,3 +18,19 @@ Target *GnuCxxCompiler::create_source(const Component &comp, const FS::Path &pat
 {
 	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())
+	{
+		FS::Path cxx_path = FS::Path("/usr/include/c++")/version;
+		if(FS::is_dir(cxx_path))
+			system_path.push_back(cxx_path);
+	}
+}