Use C++ include path from sysroot

[builder.git] / source / gnucxxcompiler.cpp

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index cadd21f026989df463412668a672b182d188bf5c..87fe1642801fbd466f92474fb9e69d25f76c1fae 100644 (file)
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,52 +1,17 @@
 #include <msp/fs/stat.h>
-#include <msp/io/print.h>
-#include <msp/strings/regex.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):
-       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");
-
-       ExternalTask::Arguments argv;
-       argv.push_back(name);
-       argv.push_back("--version");
-       builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
-       ExternalTask task(argv);
-       task.set_stdout(ExternalTask::CAPTURE);
-       task.set_stderr(ExternalTask::IGNORE);
-       task.start();
-       Task::Status status;
-       while((status=task.check())==Task::RUNNING) ;
-       if(status==Task::SUCCESS)
-               if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(task.get_output()))
-               {
-                       string cxx_ver = m[0].str;
-                       while(!cxx_ver.empty())
-                       {
-                               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", name, cxx_ver));
-                                       system_path.push_back(cxx_path);
-                                       break;
-                               }
-
-                               string::size_type dot = cxx_ver.rfind('.');
-                               if(dot==string::npos)
-                                       break;
-                               cxx_ver.erase(dot);
-                       }
-               }
 }
 
 Target *GnuCxxCompiler::create_source(const Component &comp, const FS::Path &path) const
@@ -58,3 +23,15 @@ 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);
+       }
+}