Combine the gnu and clang toolchains into SystemToolchain

[builder.git] / source / gnucxxcompiler.cpp

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index 55f7109e7b05470bb03ac690d98a970ce0323bf4..87fe1642801fbd466f92474fb9e69d25f76c1fae 100644 (file)
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,17 +1,12 @@
 #include <msp/fs/stat.h>
-#include <msp/fs/utils.h>
-#include <msp/io/print.h>
-#include <msp/strings/utils.h>
-#include "builder.h"
 #include "csourcefile.h"
-#include "externaltask.h"
 #include "gnucxxcompiler.h"
 
 using namespace std;
 using namespace Msp;
 
-GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
-       GnuCompiler(b, a, "CXX")
+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");
@@ -19,26 +14,6 @@ GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
        aux_suffixes.push_back(".hpp");
 }
 
-void GnuCxxCompiler::query_version()
-{
-       ExternalTask::Arguments argv;
-       argv.push_back(executable->get_path().str());
-       argv.push_back("-dumpversion");
-       builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
-       try
-       {
-               string cxx_ver = strip(ExternalTask::run_and_capture_output(argv));
-               FS::Path cxx_path = FS::Path("/usr/include/c++")/cxx_ver;
-               if(FS::is_dir(cxx_path))
-               {
-                       builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), cxx_ver));
-                       system_path.push_back(cxx_path);
-               }
-       }
-       catch(const runtime_error &)
-       { }
-}
-
 Target *GnuCxxCompiler::create_source(const Component &comp, const FS::Path &path) const
 {
        return new CSourceFile(builder, comp, path);
@@ -52,6 +27,11 @@ Target *GnuCxxCompiler::create_source(const FS::Path &path) const
 void GnuCxxCompiler::do_prepare()
 {
        GnuCompiler::do_prepare();
-       if(executable)
-               query_version();
+       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);
+       }
 }