Clean up compiler and linker constructors

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index ea04fbeacfb79ca92f444b8b374b68f592477271..6335aaf3cc4f51ce513b06ad3735de751e05db56 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,6 +1,4 @@
 #include <msp/core/maputils.h>
-#include <msp/fs/dir.h>
-#include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
@@ -29,7 +27,7 @@ const char *cpus[] =
 
 }
 
-GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const FS::Path &sysroot):
+GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
        Tool(b, a, t)
 {
        if(tag=="CC")
@@ -52,16 +50,6 @@ GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, con
                throw invalid_argument("GnuCompiler::GnuCompiler");
 
        set_command((tag=="CXX" ? "g++" : "gcc"), true);
-
-       if(!sysroot.empty())
-       {
-               build_info.sysroot = sysroot;
-               system_path.push_back(sysroot/"usr/include");
-       }
-       else if(architecture->is_native())
-               system_path.push_back("/usr/include");
-       else
-               system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
 }
 
 Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
@@ -111,30 +99,61 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 
 void GnuCompiler::do_prepare()
 {
+       bool path_found = false;
+       const FS::Path &sysroot = build_info.sysroot;
+
        executable = builder.get_vfs().find_binary(command);
        if(executable)
        {
                ExternalTask::Arguments argv;
                argv.push_back(executable->get_path().str());
-               argv.push_back("-dumpversion");
+               argv.push_back("-Wp,-v");
+               argv.push_back("-E");
+               if(tag=="CXX")
+                       argv.push_back("-xc++");
+               if(!sysroot.empty())
+                       argv.push_back("--sysroot="+sysroot.str());
+               argv.push_back("-");
 
                builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
                try
                {
-                       version = strip(ExternalTask::run_and_capture_output(argv));
-                       builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
-
-                       if(tag=="CXX")
+                       string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
+                       string::size_type start = 0;
+                       bool record_path = false;
+                       while(start<output.size())
                        {
-                               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);
+                               string::size_type newline = output.find('\n', start);
+                               if(!output.compare(start, 34, "#include <...> search starts here:"))
+                               {
+                                       record_path = true;
+                                       path_found = true;
+                               }
+                               else if(!output.compare(start, 19, "End of search list."))
+                                       record_path = false;
+                               else if(record_path)
+                               {
+                                       FS::Path path = strip(output.substr(start, newline-start));
+                                       builder.get_logger().log("tools", format("Got %s system path: %s", tag, path));
+                                       system_path.push_back(path);
+                               }
+                               start = newline+1;
                        }
                }
-               catch(const runtime_error &)
+               catch(const runtime_error &e)
                { }
        }
+
+       if(!path_found)
+       {
+               builder.get_logger().log("tools", format("No %s system path found, using defaults", tag));
+               if(!sysroot.empty())
+                       system_path.push_back(sysroot/"usr/include");
+               else if(architecture->is_native())
+                       system_path.push_back("/usr/include");
+               else
+                       system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
+       }
 }
 
 Task *GnuCompiler::run(const Target &target) const