Move version discovery back to GnuCompiler

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 470934e0fe7e32432f7d9b344690e9bcbd5be047..b186bb367cdb84350988f143142085c4b690a3ca 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -28,7 +28,8 @@ const char *cpus[] =
 }
 
 GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
-       Tool(b, a, t)
+       Tool(b, a, t),
+       version(0)
 {
        if(tag=="CC")
        {
@@ -101,11 +102,17 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 }
 
 void GnuCompiler::do_prepare()
+{
+       executable = builder.get_vfs().find_binary(command);
+       prepare_syspath();
+       prepare_version();
+}
+
+void GnuCompiler::prepare_syspath()
 {
        bool path_found = false;
        const FS::Path &sysroot = build_info.sysroot;
 
-       executable = builder.get_vfs().find_binary(command);
        if(executable)
        {
                ExternalTask::Arguments argv;
@@ -159,6 +166,37 @@ void GnuCompiler::do_prepare()
        }
 }
 
+void GnuCompiler::prepare_version()
+{
+       if(!executable)
+               return;
+
+       prepare_version("-dumpversion");
+       if(version>=0x70000)
+               prepare_version("-dumpfullversion");
+       builder.get_logger().log("tools", format("%s version is %d.%d.%d", FS::basename(executable->get_path()), version>>16, (version>>8)&0xFF, version&0xFF));
+}
+
+void GnuCompiler::prepare_version(const string &arg)
+{
+       ExternalTask::Arguments argv;
+       argv.push_back(executable->get_path().str());
+       argv.push_back(arg);
+
+       builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+       try
+       {
+               string version_str = strip(ExternalTask::run_and_capture_output(argv));
+
+               vector<string> version_parts = split(version_str, '.');
+               version = 0;
+               for(unsigned i=0; (i<3 && i<version_parts.size()); ++i)
+                       version |= lexical_cast<unsigned>(version_parts[i])<<(16-8*i);
+       }
+       catch(const runtime_error &)
+       { }
+}
+
 Task *GnuCompiler::run(const Target &target) const
 {
        const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);