Combine the gnu and clang toolchains into SystemToolchain

[builder.git] / source / gnucxxcompiler.cpp

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index 8084a03e8201cbdaa00ee9db8e5a34f104e980a9..87fe1642801fbd466f92474fb9e69d25f76c1fae 100644 (file)
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,8 +1,37 @@
+#include <msp/fs/stat.h>
+#include "csourcefile.h"
 #include "gnucxxcompiler.h"
 
-GnuCxxCompiler::GnuCxxCompiler(Builder &b):
-       GnuCompiler(b, "CXX", "g++")
+using namespace std;
+using namespace Msp;
+
+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);
+       }
 }